mac80211: fix ieee80211_he_oper_size() comment
Subsystems (2)
PATCH v6 1/2 mac80211: fix ieee80211_he_oper_size() comment
Johannes mentioned that the comment should not reference mac80211 as other subsystems might call the helper.
Signed-off-by John Crispin <[email protected]>
Signed-off-by Kalle Valo <[email protected]>
--- include/linux/ieee80211.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/ieee80211.h +2 -2
@@ -2053,8 +2053,8 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info)* ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size * @he_oper_ie: byte data of the He Operations IE, stating from the the byte * after the ext ID byte. It is assumed that he_oper_ie has at least -* sizeof(struct ieee80211_he_operation) bytes, checked already in -* ieee802_11_parse_elems_crc() +* sizeof(struct ieee80211_he_operation) bytes, the caller must have +* validated this. * @return the actual size of the IE data (not including header), or 0 on error */ static inline u8
Signature · 1 line
2.20.1
PATCH v6 2/2 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 <[email protected]>
Signed-off-by John Crispin <[email protected]>
Signed-off-by Kalle Valo <[email protected]>
--- include/net/mac80211.h | 2 ++ net/mac80211/he.c | 14 ++++++++++++++ net/mac80211/ieee80211_i.h | 4 ++++ net/mac80211/mlme.c | 1 + 4 files changed, 21 insertions(+)
include/net/mac80211.h +2 -0
@@ -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; };/**
net/mac80211/he.c +14 -0
@@ -50,3 +50,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_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 ; + } +memcpy (he_operation, he_op_ie_elem,sizeof (*he_operation)); +}
net/mac80211/ieee80211_i.h +4 -0
@@ -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,
net/mac80211/mlme.c +1 -0
@@ -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? */ }
Signature · 1 line
2.20.1