Commit 645acc6f authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: mlme: re-parse with correct mode 



When doing re-parsing in ieee80211_determine_chan_mode(),
the conn->mode is changed, and the whole point of doing
the parsing again was to parse as the downgraded mode.
However, that didn't actually work, because the setting
was copied before and never changed again. Fix that.

Fixes: 310c8387 ("wifi: mac80211: clean up connection process")
Reviewed-by: default avatarMiriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240418105220.5e0d1fcb5622.Ib0673e0bc90033fd6d387b6a5f107c040eb907cf@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 89884459

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,6 @@ ieee80211_determine_chan_mode(struct ieee80211_sub_if_data *sdata, 
		.from_ap = true,

		.start = ies->data,

		.len = ies->len,

		.mode = conn->mode,

	};

	struct ieee802_11_elems *elems;

	struct ieee80211_supported_band *sband;
@@ -625,6 +624,7 @@ ieee80211_determine_chan_mode(struct ieee80211_sub_if_data *sdata, 
	int ret;



again:

	parse_params.mode = conn->mode;

	elems = ieee802_11_parse_elems_full(&parse_params);

	if (!elems)

		return ERR_PTR(-ENOMEM);