aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMark Mentovai <mark@moxienet.com>2010-11-17 16:34:37 -0500
committerAK <andi@firstfloor.org>2011-03-31 11:58:52 -0700
commite3f1f25fa0344e4a981e8f5e5d5c3457ed420d35 (patch)
treea45652ccb032998bff01edcb2b31be2c341da746 /net
parent40478e1a3440c6b5e0f5fd81133494aefaf11ec2 (diff)
cfg80211: fix can_beacon_sec_chan, reenable HT40
[ upstream commit 09a02fdb919876c01e8f05960750a418b3f7fa48 ] 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> Signed-off-by: Andi Kleen <ak@linux.intel.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 93d89d607d5..bbaab4b0a4b 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -53,8 +53,10 @@ static bool can_beacon_sec_chan(struct wiphy *wiphy,
switch (channel_type) {
case NL80211_CHAN_HT40PLUS:
diff = 20;
+ break;
case NL80211_CHAN_HT40MINUS:
diff = -20;
+ break;
default:
return false;
}