mac80211: avoid bss color setting in non-he mode
Subsystems (2)
PATCH v3 1/1 mac80211: avoid bss color setting in non-he mode
Adding bss-color configuration for HE mode alone. Earlier we have enabled it by default, irrespective of capabilities. But bss-color feature is only for HE mode. Hence avoiding this by adding bss-color flag only for HE mode.
Fixes eb024f1abca3("mac80211: avoid bss color setting in non-he mode")
Reported-by kernel test robot <[email protected]>
Reported-by Rajkumar Manoharan <[email protected]>
Signed-off-by P Praneesh <[email protected]>
---
v3:
-fixed compilation error, reported by kernel test robot.
v2:
-addressed Rajkumar's comments.
-moved remaining HE flags under
corresponding check.
--- net/mac80211/cfg.c | 8 +++++--- net/mac80211/mlme.c | 4 +++- net/wireless/nl80211.c | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-)
net/mac80211/cfg.c +5 -3
@@ -991,9 +991,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,BSS_CHANGED_SSID |BSS_CHANGED_P2P_PS |BSS_CHANGED_TXPOWER | -BSS_CHANGED_TWT | -BSS_CHANGED_HE_OBSS_PD | -BSS_CHANGED_HE_BSS_COLOR ; +BSS_CHANGED_TWT ;int i, err;int prev_beacon_int;
@@ -1019,6 +1017,10 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, sdata->vif.bss_conf.frame_time_rts_th =le32_get_bits (params->he_oper->he_oper_params,IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK ); + changed |=BSS_CHANGED_HE_OBSS_PD ; + +if (!params->he_bss_color.disabled) + changed |=BSS_CHANGED_HE_BSS_COLOR ; }mutex_lock (&local->mtx);
net/mac80211/mlme.c +3 -1
@@ -3463,7 +3463,9 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, bss_conf->he_bss_color.disabled =le32_get_bits (elems->he_operation->he_oper_params,IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED ); - changed |=BSS_CHANGED_HE_BSS_COLOR ; + +if (!bss_conf->he_bss_color.disabled) + changed |=BSS_CHANGED_HE_BSS_COLOR ; bss_conf->htc_trig_based_pkt_ext = le32_get_bits(elems->he_operation->he_oper_params,
net/wireless/nl80211.c +3 -0
@@ -5019,6 +5019,9 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) goto out; } +/* disabling BSS color default */ + params.he_bss_color.disabled = true; +if (info->attrs[NL80211_ATTR_HE_BSS_COLOR ]) { err = nl80211_parse_he_bss_color( info->attrs[NL80211_ATTR_HE_BSS_COLOR],
Signature · 1 line
2.7.4