summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2022-07-12 10:49:23 +0200
committerJohannes Berg <johannes.berg@intel.com>2022-07-15 11:43:21 +0200
commit39eac2de0098c3ac3e9c35cfdc924543f1f67acc (patch)
treecb38a51b68f0ce5dd11fe66f12476e9b37623732 /net/mac80211/mlme.c
parentde03f8ac5c5225a675c754c1b2b69771b77dfa84 (diff)
downloadlinux-39eac2de0098c3ac3e9c35cfdc924543f1f67acc.tar.gz
linux-39eac2de0098c3ac3e9c35cfdc924543f1f67acc.tar.bz2
linux-39eac2de0098c3ac3e9c35cfdc924543f1f67acc.zip
wifi: mac80211: move IEEE80211_SDATA_OPERATING_GMODE to link
The flag here is currently per interface, but the way we set and clear it means it should be per link, so change it. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 5c08b256bbc9..babe4986207a 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -5811,11 +5811,8 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
link->conf->basic_rates = basic_rates;
/* cf. IEEE 802.11 9.2.12 */
- if (cbss->channel->band == NL80211_BAND_2GHZ &&
- have_higher_than_11mbit)
- sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE;
- else
- sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;
+ link->operating_11g_mode = sband->band == NL80211_BAND_2GHZ &&
+ have_higher_than_11mbit;
skip_rates:
memcpy(link->u.mgd.bssid, cbss->bssid, ETH_ALEN);