From bd8c8a2057eedf48ba8d969302500d41d9a3e06a Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 14 Dec 2012 00:19:08 +0100 Subject: [PATCH] --- yaml --- r: 351748 b: refs/heads/master c: 9cab315190cddbe3aaa31b64841354dd719afdfd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/wireless/chan.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 141cb55aafc8..8a0ad75baf69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75de9113bb9dc4939a7cd54e4bdfad555b35f5b1 +refs/heads/master: 9cab315190cddbe3aaa31b64841354dd719afdfd diff --git a/trunk/net/wireless/chan.c b/trunk/net/wireless/chan.c index a7990bb16529..396373f3ec26 100644 --- a/trunk/net/wireless/chan.c +++ b/trunk/net/wireless/chan.c @@ -76,6 +76,10 @@ bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) return false; if (!chandef->center_freq2) return false; + /* adjacent is not allowed -- that's a 160 MHz channel */ + if (chandef->center_freq1 - chandef->center_freq2 == 80 || + chandef->center_freq2 - chandef->center_freq1 == 80) + return false; break; case NL80211_CHAN_WIDTH_80: if (chandef->center_freq1 != control_freq + 30 &&