mac80211: set short_slot for 6 GHz band

tmussai · jmberg-intel · commit 07c12d618f06 · 2020-05-31T11:27:22.000+02:00
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
@@ -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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -2198,7 +2198,8 @@ static int ieee80211_change_bss(struct wiphy *wiphy,`
`2198`	`2198`	`}`
`2199`	`2199`
`2200`	`2200`	`if (!sdata->vif.bss_conf.use_short_slot &&`
`2201`		`- sband->band == NL80211_BAND_5GHZ) {`
	`2201`	`+ (sband->band == NL80211_BAND_5GHZ \|\|`
	`2202`	`+ sband->band == NL80211_BAND_6GHZ)) {`
`2202`	`2203`	`sdata->vif.bss_conf.use_short_slot = true;`
`2203`	`2204`	`changed \|= BSS_CHANGED_ERP_SLOT;`
`2204`	`2205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2171,7 +2171,8 @@ static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata,`
`2171`	`2171`	`}`
`2172`	`2172`
`2173`	`2173`	`use_short_slot = !!(capab & WLAN_CAPABILITY_SHORT_SLOT_TIME);`
`2174`		`- if (sband->band == NL80211_BAND_5GHZ)`
	`2174`	`+ if (sband->band == NL80211_BAND_5GHZ \|\|`
	`2175`	`+ sband->band == NL80211_BAND_6GHZ)`
`2175`	`2176`	`use_short_slot = true;`
`2176`	`2177`
`2177`	`2178`	`if (use_protection != bss_conf->use_cts_prot) {`