mac80211: set short_slot for 6 GHz band

Set short slot also for 6 GHz band, just like 5 GHz.

Signed-off-by: Tova Mussai <tova.mussai@intel.com>
Link: https://lore.kernel.org/r/20200528213443.75f38e6f5efd.I272fbae402b03123f04e9ae69204eeab960c70cd@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 90a07d075fdbf48fd9b1d4e50e8fa28a5dddce9b..9b360544ad6ff6c537677a27278e38ffd41ef09c 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2198,7 +2198,8 @@ static int ieee80211_change_bss(struct wiphy *wiphy,
        }
 
        if (!sdata->vif.bss_conf.use_short_slot &&
-           sband->band == NL80211_BAND_5GHZ) {
+           (sband->band == NL80211_BAND_5GHZ ||
+            sband->band == NL80211_BAND_6GHZ)) {
                sdata->vif.bss_conf.use_short_slot = true;
                changed |= BSS_CHANGED_ERP_SLOT;
        }

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d7bffd640ed3c987194dbbd82b64f6d76f06aaab..5820ef02a5871cdb5d9f492185579dc38539d777 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2171,7 +2171,8 @@ static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata,
        }
 
        use_short_slot = !!(capab & WLAN_CAPABILITY_SHORT_SLOT_TIME);
-       if (sband->band == NL80211_BAND_5GHZ)
+       if (sband->band == NL80211_BAND_5GHZ ||
+           sband->band == NL80211_BAND_6GHZ)
                use_short_slot = true;
 
        if (use_protection != bss_conf->use_cts_prot) {