Commit 322cd27c authored by P Praneesh's avatar P Praneesh Committed by Johannes Berg
Browse files

cfg80211/mac80211: avoid bss color setting in non-HE modes 



Adding bss-color configuration is only valid in HE mode.
Earlier we have enabled it by default, irrespective of
capabilities/mode. Fix that.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarRajkumar Manoharan <rmanohar@codeaurora.org>
Signed-off-by: default avatarP Praneesh <ppranees@codeaurora.org>
Link: https://lore.kernel.org/r/1594262781-21444-1-git-send-email-ppranees@codeaurora.org


[fix up commit message]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 180ac48e

net/mac80211/cfg.c

+5 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -3463,6 +3463,8 @@ 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);



		if (!bss_conf->he_bss_color.disabled)

			changed |= BSS_CHANGED_HE_BSS_COLOR;



		bss_conf->htc_trig_based_pkt_ext =

net/wireless/nl80211.c

+3 −0
Original line number Diff line number Diff line
@@ -4865,6 +4865,9 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) 


	memset(&params, 0, sizeof(params));



	/* disable BSS color by default */

	params.he_bss_color.disabled = true;



	/* these are required for START_AP */

	if (!info->attrs[NL80211_ATTR_BEACON_INTERVAL] ||

	    !info->attrs[NL80211_ATTR_DTIM_PERIOD] ||