aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-11-19 01:02:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-11-19 01:02:33 +0000
commit77b7fb441c31be7e2aef869bb6a1dcb3b17504d0 (patch)
tree8b3b38afea876b4fec12b23ac0635000fe3512c8
parent7ae3b77890525341e57cd9ee44992a86e1f55547 (diff)
downloadupstream-77b7fb441c31be7e2aef869bb6a1dcb3b17504d0.tar.gz
upstream-77b7fb441c31be7e2aef869bb6a1dcb3b17504d0.tar.bz2
upstream-77b7fb441c31be7e2aef869bb6a1dcb3b17504d0.zip
mac80211: merge the upstream ht40 fix
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24033 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/310-pending_work.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/package/mac80211/patches/310-pending_work.patch b/package/mac80211/patches/310-pending_work.patch
index ea02fcbc1c..96918888d3 100644
--- a/package/mac80211/patches/310-pending_work.patch
+++ b/package/mac80211/patches/310-pending_work.patch
@@ -290,3 +290,16 @@
mutex_unlock(&reg_mutex);
return r;
+--- a/net/wireless/chan.c
++++ b/net/wireless/chan.c
+@@ -54,8 +54,10 @@ static bool can_beacon_sec_chan(struct w
+ switch (channel_type) {
+ case NL80211_CHAN_HT40PLUS:
+ diff = 20;
++ break;
+ case NL80211_CHAN_HT40MINUS:
+ diff = -20;
++ break;
+ default:
+ return false;
+ }