Upon a successful assoc a station shall store the content of the HE operation element inside ieee80211_sta so that the driver can setup the hardware accordingly.
Signed-off-by: Shashidhar Lakkavalli <[email protected]> Signed-off-by: John Crispin <[email protected]> --- include/net/mac80211.h | 2 ++ net/mac80211/he.c | 14 ++++++++++++++ net/mac80211/ieee80211_i.h | 5 +++++ net/mac80211/mlme.c | 1 + 4 files changed, 22 insertions(+) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 112dc18c658f..ba4a16f87364 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1903,6 +1903,7 @@ struct ieee80211_sta_rates { * @ht_cap: HT capabilities of this STA; restricted to our own capabilities * @vht_cap: VHT capabilities of this STA; restricted to our own capabilities * @he_cap: HE capabilities of this STA + * @he_operation: HE operation information of the AP we are connected to * @max_rx_aggregation_subframes: maximal amount of frames in a single AMPDU * that this station is allowed to transmit to us. * Can be modified by driver. @@ -1941,6 +1942,7 @@ struct ieee80211_sta { struct ieee80211_sta_ht_cap ht_cap; struct ieee80211_sta_vht_cap vht_cap; struct ieee80211_sta_he_cap he_cap; + struct ieee80211_he_operation he_operation; u16 max_rx_aggregation_subframes; bool wme; u8 uapsd_queues; diff --git a/net/mac80211/he.c b/net/mac80211/he.c index 769078ed5a12..62ef029e5c48 100644 --- a/net/mac80211/he.c +++ b/net/mac80211/he.c @@ -53,3 +53,17 @@ 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_sta_he_op(struct ieee80211_sub_if_data *sdata, + const struct ieee80211_he_operation *he_op_ie_elem, + struct sta_info *sta) +{ + struct ieee80211_he_operation *he_operation = &sta->sta.he_operation; + + if (!he_op_ie_elem) { + memset(he_operation, 0, sizeof(*he_operation)); + return; + } + memcpy(he_operation, he_op_ie_elem, sizeof(*he_operation)); +} diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index e170f986d226..11bc1778bfd5 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1870,6 +1870,11 @@ 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_sta_he_op(struct ieee80211_sub_if_data *sdata, + const struct ieee80211_he_operation *he_op_ie_elem, + struct sta_info *sta); + /* 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 2dbcf5d5512e..5d8a8a0feaf9 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3364,6 +3364,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_sta_he_op(sdata, elems.he_operation, sta); /* TODO: OPEN: what happens if BSS color disable is set? */ } -- 2.20.1
