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

Commit 7633d41a authored by Johannes Berg's avatar Johannes Berg Committed by Treehugger Robot
Browse files

UPSTREAM: wifi: mac80211: don't parse mbssid in assoc response 



This is simply not valid and simplifies the next commit.
I'll make a separate patch for this in the current main
tree as well.

Bug: 254180332
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
[Lee: Commit not upstream - plucked straight from Stable)
(cherry picked from commit 9478c5f9)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I83b35213bb47506e4c687e2c8be0c53dc497fd98
parent 9f3b5ab8

net/mac80211/mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -3226,7 +3226,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, 


	pos = mgmt->u.assoc_resp.variable;

	ieee802_11_parse_elems(pos, len - (pos - (u8 *)mgmt), false, &elems,

			       mgmt->bssid, assoc_data->bss->bssid);

			       mgmt->bssid, NULL);



	if (!elems.supp_rates) {

		sdata_info(sdata, "no SuppRates element in AssocResp\n");
@@ -3579,7 +3579,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 


	pos = mgmt->u.assoc_resp.variable;

	ieee802_11_parse_elems(pos, len - (pos - (u8 *)mgmt), false, &elems,

			       mgmt->bssid, assoc_data->bss->bssid);

			       mgmt->bssid, NULL);



	if (status_code == WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY &&

	    elems.timeout_int &&