mac80211: merge the upstream ht40 fix

SVN-Revision: 24033
This commit is contained in:
Felix Fietkau 2010-11-19 01:02:33 +00:00
parent a72af79590
commit 8442d62654

View file

@ -290,3 +290,16 @@
mutex_unlock(&reg_mutex); mutex_unlock(&reg_mutex);
return r; 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;
}