From 2841cc9ce1be5f9f0623db5da8452745a74d620d Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 12 Nov 2012 10:51:34 +0100 Subject: [PATCH] --- yaml --- r: 335771 b: refs/heads/master c: 43c771a1963ab461a2f194e3c97fded1d5fe262f h: refs/heads/master i: 335769: 5af40db0119fb96fc6eeae3ba6f8f6ddafa0d17b 335767: 0011adccd10a0370ca175e8565074803c2bbcc59 v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d32673d3e5c4..0ac0dcab8dba 100644 --- 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 index bcc7d7ee5a51..b75756b05af7 100644 --- 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