1 --- a/net/mac80211/mlme.c
2 +++ b/net/mac80211/mlme.c
3 @@ -670,6 +670,8 @@ static u32 ieee80211_handle_bss_capabili
6 use_short_slot = !!(capab & WLAN_CAPABILITY_SHORT_SLOT_TIME);
7 + if (sdata->local->hw.conf.channel->band == IEEE80211_BAND_5GHZ)
8 + use_short_slot = true;
10 if (use_protection != bss_conf->use_cts_prot) {
11 bss_conf->use_cts_prot = use_protection;
12 --- a/net/mac80211/cfg.c
13 +++ b/net/mac80211/cfg.c
14 @@ -1087,6 +1087,13 @@ static int ieee80211_change_bss(struct w
15 params->use_short_preamble;
16 changed |= BSS_CHANGED_ERP_PREAMBLE;
19 + if (!sdata->vif.bss_conf.use_short_slot &&
20 + sdata->local->hw.conf.channel->band == IEEE80211_BAND_5GHZ) {
21 + sdata->vif.bss_conf.use_short_slot = true;
22 + changed |= BSS_CHANGED_ERP_SLOT;
25 if (params->use_short_slot_time >= 0) {
26 sdata->vif.bss_conf.use_short_slot =
27 params->use_short_slot_time;