Commit 0eb38842 authored by Aloka Dixit's avatar Aloka Dixit Committed by Johannes Berg
Browse files

wifi: mac80211: reset multiple BSSID options in stop_ap() 



Reset multiple BSSID options when all AP related configurations are
reset in ieee80211_stop_ap().

Stale values result in HWSIM test failures (e.g. p2p_group_cli_invalid),
if run after 'he_ap_ema'.

Reported-by: default avatarJouni Malinen <j@w1.fi>
Signed-off-by: default avatarAloka Dixit <quic_alokad@quicinc.com>
Link: https://lore.kernel.org/r/20221221185616.11514-1-quic_alokad@quicinc.com


Cc: stable@vger.kernel.org
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 592234e9

net/mac80211/cfg.c

+7 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static int ieee80211_set_ap_mbssid_options(struct ieee80211_sub_if_data *sdata, 
	link_conf->bssid_index = 0;

	link_conf->nontransmitted = false;

	link_conf->ema_ap = false;

	link_conf->bssid_indicator = 0;



	if (sdata->vif.type != NL80211_IFTYPE_AP || !params.tx_wdev)

		return -EINVAL;
@@ -1511,6 +1512,12 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev, 
	kfree(link_conf->ftmr_params);

	link_conf->ftmr_params = NULL;



	sdata->vif.mbssid_tx_vif = NULL;

	link_conf->bssid_index = 0;

	link_conf->nontransmitted = false;

	link_conf->ema_ap = false;

	link_conf->bssid_indicator = 0;



	__sta_info_flush(sdata, true);

	ieee80211_free_keys(sdata, true);