cfg80211: adjacent 80+80 MHz channel segments are invalid

In that case, it's really a 160 MHz channel, so disallow
this configuration.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index a7990bb165295bcefbd88c6396026e2db8b7fa38..396373f3ec260b96a178dce7e72c239cf78bdc51 100644 (file)
--- a/net/wireless/chan.c
+++ b/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 &&