mac80211: merge the upstream ht40 fix

SVN-Revision: 24033
2010-11-19 01:02:33 +00:00 · 2010-11-19 01:02:33 +00:00 · 8442d62654
commit 8442d62654
parent a72af79590
1 changed files with 13 additions and 0 deletions
--- 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;
+ 	}