summary refs log tree commit diff
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorTova Mussai <tova.mussai@intel.com>2020-05-28 21:34:46 +0200
committerJohannes Berg <johannes.berg@intel.com>2020-05-31 11:27:22 +0200
commit07c12d618f06c8876fe12a53217d92b32d7baf07 (patch)
tree18a0afa7ce5c7e3c1eb13dfd4c6dd4525394bc0d /net/mac80211/cfg.c
parent6fcb56ce0f9036b08d1c3e35ff93b100d499771b (diff)
downloadlinux-07c12d618f06c8876fe12a53217d92b32d7baf07.tar.gz
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>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 90a07d075fdb..9b360544ad6f 100644
--- 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;
 	}