---

yaml --- r: 335771 b: refs/heads/master c: 43c771a h: refs/heads/master i: 335769: 5af40db 335767: 0011adc v: v3
git-mirror · Nov 12, 2012 · 2841cc9 · 2841cc9
1 parent bf38072
commit 2841cc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f98ab7fef48a2968f37f422c256c9fbd978c3f0
+refs/heads/master: 43c771a1963ab461a2f194e3c97fded1d5fe262f
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -141,9 +141,8 @@ static const struct ieee80211_regdomain world_regdom = {
 	.reg_rules = {
 		/* IEEE 802.11b/g, channels 1..11 */
 		REG_RULE(2412-10, 2462+10, 40, 6, 20, 0),
-		/* IEEE 802.11b/g, channels 12..13. No HT40
-		 * channel fits here. */
-		REG_RULE(2467-10, 2472+10, 20, 6, 20,
+		/* IEEE 802.11b/g, channels 12..13. */
+		REG_RULE(2467-10, 2472+10, 40, 6, 20,
 			NL80211_RRF_PASSIVE_SCAN |
 			NL80211_RRF_NO_IBSS),
 		/* IEEE 802.11 channel 14 - Only JP enables