mac80211: propagate HE operation info into bss_conf

Upon a successful assoc a station shall store the content of the HE
operation element inside bss_conf so that the driver can setup the
hardware accordingly.

Signed-off-by: Shashidhar Lakkavalli <slakkavalli@datto.com>
Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20190729102342.8659-2-john@phrozen.org
[use struct copy]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 9effd286c1aee9b40744f06cfb29299b96e84146..bd91388797fc3b52337aeb49d0c886c9a83fe83e 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -600,6 +600,7 @@ struct ieee80211_ftm_responder_params {
  *     nontransmitted BSSIDs
  * @profile_periodicity: the least number of beacon frames need to be received
  *     in order to discover all the nontransmitted BSSIDs in the set.
+ * @he_operation: HE operation information of the AP we are connected to
  */
 struct ieee80211_bss_conf {
        const u8 *bssid;
@@ -661,6 +662,7 @@ struct ieee80211_bss_conf {
        u8 bssid_indicator;
        bool ema_ap;
        u8 profile_periodicity;
+       struct ieee80211_he_operation he_operation;
 };
 
 /**

diff --git a/net/mac80211/he.c b/net/mac80211/he.c
index 219650591c7953e43a145b80f4dac07b6480c494..f910f730ad0dcf577c349bf0a574e83135d196a4 100644 (file)
--- a/net/mac80211/he.c
+++ b/net/mac80211/he.c
@@ -50,3 +50,18 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata,
 
        he_cap->has_he = true;
 }
+
+void
+ieee80211_he_op_ie_to_bss_conf(struct ieee80211_vif *vif,
+                       const struct ieee80211_he_operation *he_op_ie_elem)
+{
+       struct ieee80211_he_operation *he_operation =
+                                       &vif->bss_conf.he_operation;
+
+       if (!he_op_ie_elem) {
+               memset(he_operation, 0, sizeof(*he_operation));
+               return;
+       }
+
+       vif->bss_conf.he_operation = *he_op_ie_elem;
+}

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index a5818ff0e2a493fbbbc44213f7d7205d5105bcc7..ba1bc245678e2de9f19985a05b279d938b42796d 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1873,6 +1873,10 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata,
                                  const u8 *he_cap_ie, u8 he_cap_len,
                                  struct sta_info *sta);
 
+void
+ieee80211_he_op_ie_to_bss_conf(struct ieee80211_vif *vif,
+                       const struct ieee80211_he_operation *he_op_ie_elem);
+
 /* Spectrum management */
 void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,
                                       struct ieee80211_mgmt *mgmt,

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index a99ad032530946fd8c5d82cfd799ba598284e10d..2b8a7428973da2b5fa96a432e894e3eaa9f22f80 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3381,6 +3381,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
                if (elems.uora_element)
                        bss_conf->uora_ocw_range = elems.uora_element[0];
 
+               ieee80211_he_op_ie_to_bss_conf(&sdata->vif, elems.he_operation);
                /* TODO: OPEN: what happens if BSS color disable is set? */
        }