summaryrefslogtreecommitdiffstats
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
commit8442d626548f82a21b170ef1c14e132b13fa086c (patch)
tree0ec4e53a4c6157bd55b4ad5388011d885b0fea37
parenta72af795905a8b0bb5960e0280bf7d3c2b440d9f (diff)
downloadmaster-31e0f0ae-8442d626548f82a21b170ef1c14e132b13fa086c.tar.gz
master-31e0f0ae-8442d626548f82a21b170ef1c14e132b13fa086c.tar.bz2
master-31e0f0ae-8442d626548f82a21b170ef1c14e132b13fa086c.zip
mac80211: merge the upstream ht40 fix
SVN-Revision: 24033
-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;
+ }