aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMark Mentovai <mark@moxienet.com>2010-11-17 16:34:37 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-11-18 11:35:05 -0500
commit09a02fdb919876c01e8f05960750a418b3f7fa48 (patch)
tree56be1e83394ba38590ab16a0d2905fe49e05414d /net
parent9236d838c920e90708570d9bbd7bb82d30a38130 (diff)
cfg80211: fix can_beacon_sec_chan, reenable HT40
This follows wireless-testing 9236d838c920e90708570d9bbd7bb82d30a38130 ("cfg80211: fix extension channel checks to initiate communication") and fixes accidental case fall-through. Without this fix, HT40 is entirely blocked. Signed-off-by: Mark Mentovai <mark@moxienet.com> Cc: stable@kernel.org Acked-by: Luis R. Rodriguez <lrodriguez@atheros.com Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/chan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index c8d190d911e4..17cd0c04d139 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -54,8 +54,10 @@ static bool can_beacon_sec_chan(struct wiphy *wiphy,
54 switch (channel_type) { 54 switch (channel_type) {
55 case NL80211_CHAN_HT40PLUS: 55 case NL80211_CHAN_HT40PLUS:
56 diff = 20; 56 diff = 20;
57 break;
57 case NL80211_CHAN_HT40MINUS: 58 case NL80211_CHAN_HT40MINUS:
58 diff = -20; 59 diff = -20;
60 break;
59 default: 61 default:
60 return false; 62 return false;
61 } 63 }