---

yaml --- r: 351748 b: refs/heads/master c: 9cab315 h: refs/heads/master v: v3
git-mirror · Jan 3, 2013 · bd8c8a2 · bd8c8a2
1 parent 9bbd6e1
commit bd8c8a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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 &&