From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 19 Nov 2010 01:02:33 +0000 (+0000)
Subject: mac80211: merge the upstream ht40 fix
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8442d626548f82a21b170ef1c14e132b13fa086c;p=openwrt%2Fstaging%2Fjow.git

mac80211: merge the upstream ht40 fix

SVN-Revision: 24033
---

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;
+ 	}