diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:15:43 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:15:43 -0500 |
| commit | bd2a81307487eba486f200423330d2403d0b893b (patch) | |
| tree | f15102f503619bcbd266acf650ade8b7b17f1c04 /net/wireless/reg.c | |
| parent | 6fe7cc71bbf3a0bc28c9cec3c00bc11e81344412 (diff) | |
| parent | 43c771a1963ab461a2f194e3c97fded1d5fe262f (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index bcc7d7ee5a51..b75756b05af7 100644 --- a/net/wireless/reg.c +++ b/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 |