Commit 07c12d61 authored by Tova Mussai's avatar Tova Mussai Committed by Johannes Berg

mac80211: set short_slot for 6 GHz band

Set short slot also for 6 GHz band, just like 5 GHz.
Signed-off-by: default avatarTova Mussai <tova.mussai@intel.com>
Link: https://lore.kernel.org/r/20200528213443.75f38e6f5efd.I272fbae402b03123f04e9ae69204eeab960c70cd@changeidSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6fcb56ce
...@@ -2198,7 +2198,8 @@ static int ieee80211_change_bss(struct wiphy *wiphy, ...@@ -2198,7 +2198,8 @@ static int ieee80211_change_bss(struct wiphy *wiphy,
} }
if (!sdata->vif.bss_conf.use_short_slot && 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; sdata->vif.bss_conf.use_short_slot = true;
changed |= BSS_CHANGED_ERP_SLOT; changed |= BSS_CHANGED_ERP_SLOT;
} }
......
...@@ -2171,7 +2171,8 @@ static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata, ...@@ -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); 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; use_short_slot = true;
if (use_protection != bss_conf->use_cts_prot) { if (use_protection != bss_conf->use_cts_prot) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment