diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-07-12 10:49:23 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2022-07-15 11:43:21 +0200 |
| commit | 39eac2de0098c3ac3e9c35cfdc924543f1f67acc (patch) | |
| tree | cb38a51b68f0ce5dd11fe66f12476e9b37623732 /net/mac80211/ibss.c | |
| parent | wifi: mac80211: make ieee80211_check_rate_mask() link-aware (diff) | |
| download | linux-39eac2de0098c3ac3e9c35cfdc924543f1f67acc.tar.xz 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/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index e8df4ce33984..60b5230778a3 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -351,10 +351,8 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, bss_change |= BSS_CHANGED_ERP_SLOT; /* cf. IEEE 802.11 9.2.12 */ - if (chan->band == NL80211_BAND_2GHZ && have_higher_than_11mbit) - sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE; - else - sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE; + sdata->deflink.operating_11g_mode = + chan->band == NL80211_BAND_2GHZ && have_higher_than_11mbit; ieee80211_set_wmm_default(&sdata->deflink, true, false); |