summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-12-03 22:09:22 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-03-06 16:36:05 +0100
commit8ab9d85c650477cbf28a0a0dfc9796c505d03d82 (patch)
tree7571bc91527de0b35c2ba7e235cc54c794f41023 /net/wireless
parent93d08f0b785dd3878a3b84a9013a15e57e6b4344 (diff)
downloadlinux-3.10-8ab9d85c650477cbf28a0a0dfc9796c505d03d82.tar.gz
linux-3.10-8ab9d85c650477cbf28a0a0dfc9796c505d03d82.tar.bz2
linux-3.10-8ab9d85c650477cbf28a0a0dfc9796c505d03d82.zip
regulatory: allow VHT channels in world roaming
For VHT, the wider bandwidths (up to 160 MHz) need to be allowed. Since world roaming only covers the case of connecting to an AP, it can be opened up there, we will rely on the AP to know the local regulations. Acked-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 98532c00242..e6df52dc8c6 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -184,14 +184,14 @@ static const struct ieee80211_regdomain world_regdom = {
NL80211_RRF_NO_IBSS |
NL80211_RRF_NO_OFDM),
/* IEEE 802.11a, channel 36..48 */
- REG_RULE(5180-10, 5240+10, 40, 6, 20,
+ REG_RULE(5180-10, 5240+10, 80, 6, 20,
NL80211_RRF_PASSIVE_SCAN |
NL80211_RRF_NO_IBSS),
- /* NB: 5260 MHz - 5700 MHz requies DFS */
+ /* NB: 5260 MHz - 5700 MHz requires DFS */
/* IEEE 802.11a, channel 149..165 */
- REG_RULE(5745-10, 5825+10, 40, 6, 20,
+ REG_RULE(5745-10, 5825+10, 80, 6, 20,
NL80211_RRF_PASSIVE_SCAN |
NL80211_RRF_NO_IBSS),