Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c905767 authored by Manikanta Pubbisetty's avatar Manikanta Pubbisetty Committed by Greg Kroah-Hartman
Browse files

mac80211: Reset MBSSID parameters upon connection 



[ Upstream commit 86af062f40a73bf63321694e6bf637144f0383fe ]

Currently MBSSID parameters in struct ieee80211_bss_conf
are not reset upon connection. This could be problematic
with some drivers in a scenario where the device first
connects to a non-transmit BSS and then connects to a
transmit BSS of a Multi BSS AP. The MBSSID parameters
which are set after connecting to a non-transmit BSS will
not be reset and the same parameters will be passed on to
the driver during the subsequent connection to a transmit
BSS of a Multi BSS AP.

For example, firmware running on the ath11k device uses the
Multi BSS data for tracking the beacon of a non-transmit BSS
and reports the driver when there is a beacon miss. If we do
not reset the MBSSID parameters during the subsequent
connection to a transmit BSS, then the driver would have
wrong MBSSID data and FW would be looking for an incorrect
BSSID in the MBSSID beacon of a Multi BSS AP and reports
beacon loss leading to an unstable connection.

Reset the MBSSID parameters upon every connection to solve this
problem.

Fixes: 78ac51f8 ("mac80211: support multi-bssid")
Signed-off-by: default avatarManikanta Pubbisetty <quic_mpubbise@quicinc.com>
Link: https://lore.kernel.org/r/20220428052744.27040-1-quic_mpubbise@quicinc.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cfe74fd4

net/mac80211/mlme.c

+6 −0
Original line number Diff line number Diff line
@@ -3406,6 +3406,12 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, 
				cbss->transmitted_bss->bssid);

		bss_conf->bssid_indicator = cbss->max_bssid_indicator;

		bss_conf->bssid_index = cbss->bssid_index;

	} else {

		bss_conf->nontransmitted = false;

		memset(bss_conf->transmitter_bssid, 0,

		       sizeof(bss_conf->transmitter_bssid));

		bss_conf->bssid_indicator = 0;

		bss_conf->bssid_index = 0;

	}



	/*