summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-15 02:03:25 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-15 02:03:25 +0000
commitc8e6838a62832eac5e5780e6f98d3109a805d394 (patch)
treeb78c0e310ee039e06dedddd403586eb5a59726b8 /package
parent461c02892a66114b759f4b0483ff93b643e835a5 (diff)
mac80211: add a missing chunk of the short slot patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19143 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/patches/540-short_slot_handling.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/package/mac80211/patches/540-short_slot_handling.patch b/package/mac80211/patches/540-short_slot_handling.patch
index ed6831fbe..70341473e 100644
--- a/package/mac80211/patches/540-short_slot_handling.patch
+++ b/package/mac80211/patches/540-short_slot_handling.patch
@@ -9,3 +9,19 @@
if (use_protection != bss_conf->use_cts_prot) {
bss_conf->use_cts_prot = use_protection;
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -1087,6 +1087,13 @@ static int ieee80211_change_bss(struct w
+ params->use_short_preamble;
+ changed |= BSS_CHANGED_ERP_PREAMBLE;
+ }
++
++ if (!sdata->vif.bss_conf.use_short_slot &&
++ sdata->local->hw.conf.channel->band == IEEE80211_BAND_5GHZ) {
++ sdata->vif.bss_conf.use_short_slot = true;
++ changed |= BSS_CHANGED_ERP_SLOT;
++ }
++
+ if (params->use_short_slot_time >= 0) {
+ sdata->vif.bss_conf.use_short_slot =
+ params->use_short_slot_time;