aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-01-15 02:03:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-01-15 02:03:25 +0000
commitaa2ebbf15ec066d55104c7223d042c31d0ccc3bc (patch)
tree9c592c2ba13f849284b5b86b3b1d9c10a3fa4f7d
parentb35e22bd24bdb67547db37daefebba6921e420ad (diff)
downloadupstream-aa2ebbf15ec066d55104c7223d042c31d0ccc3bc.tar.gz
upstream-aa2ebbf15ec066d55104c7223d042c31d0ccc3bc.tar.bz2
upstream-aa2ebbf15ec066d55104c7223d042c31d0ccc3bc.zip
mac80211: add a missing chunk of the short slot patch
SVN-Revision: 19143
-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 ed6831fbe6..70341473e1 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;