ar71xx: the lack of DQ* flash status checking for cfi cmdset 0002 does not only apply...
[openwrt-10.03/.git] / package / mac80211 / patches / 540-short_slot_handling.patch
1 --- a/net/mac80211/mlme.c
2 +++ b/net/mac80211/mlme.c
3 @@ -670,6 +670,8 @@ static u32 ieee80211_handle_bss_capabili
4         }
5  
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;
9  
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;
17         }
18 +
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;
23 +       }
24 +
25         if (params->use_short_slot_time >= 0) {
26                 sdata->vif.bss_conf.use_short_slot =
27                         params->use_short_slot_time;