diff options
| author | John W. Linville <linville@tuxdriver.com> | 2015-12-16 13:12:05 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2015-12-16 13:12:05 -0500 |
| commit | 08f7838da246bec7490b0ff4f3d0f2422b01230b (patch) | |
| tree | a8d6b02be5e0da86cb25888dcd9693352477dccf | |
| parent | 0a40ed193bcc5246810e8e01a37beaf645e2948a (diff) | |
| parent | c45932df56120a73b05f391be9730185eb51eecf (diff) | |
| download | wireless-testing-08f7838da246bec7490b0ff4f3d0f2422b01230b.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
| -rw-r--r-- | net/wireless/reg.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 77119b4d38fac..c5fb317eee68f 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -222,20 +222,22 @@ static const struct ieee80211_regdomain world_regdom = { /* IEEE 802.11b/g, channels 1..11 */ REG_RULE(2412-10, 2462+10, 40, 6, 20, 0), /* IEEE 802.11b/g, channels 12..13. */ - REG_RULE(2467-10, 2472+10, 40, 6, 20, - NL80211_RRF_NO_IR), + REG_RULE(2467-10, 2472+10, 20, 6, 20, + NL80211_RRF_NO_IR | NL80211_RRF_AUTO_BW), /* IEEE 802.11 channel 14 - Only JP enables * this and for 802.11b only */ REG_RULE(2484-10, 2484+10, 20, 6, 20, NL80211_RRF_NO_IR | NL80211_RRF_NO_OFDM), /* IEEE 802.11a, channel 36..48 */ - REG_RULE(5180-10, 5240+10, 160, 6, 20, - NL80211_RRF_NO_IR), + REG_RULE(5180-10, 5240+10, 80, 6, 20, + NL80211_RRF_NO_IR | + NL80211_RRF_AUTO_BW), /* IEEE 802.11a, channel 52..64 - DFS required */ - REG_RULE(5260-10, 5320+10, 160, 6, 20, + REG_RULE(5260-10, 5320+10, 80, 6, 20, NL80211_RRF_NO_IR | + NL80211_RRF_AUTO_BW | NL80211_RRF_DFS), /* IEEE 802.11a, channel 100..144 - DFS required */ |