From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 15 Jan 2010 02:03:25 +0000 (+0000)
Subject: mac80211: add a missing chunk of the short slot patch
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=ba83735681635622205517748dc6bed5f70b5d41;p=openwrt%2Fsvn-archive%2Farchive.git

mac80211: add a missing chunk of the short slot patch

SVN-Revision: 19143
---

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;