diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-02-21 00:20:38 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:52:59 -0500 |
commit | 3fc71f775af677f640f0f0780b16f1b0958f6d9d (patch) | |
tree | 98a65f18760c15482b57f5f67ec3583a4611230f /net/wireless | |
parent | 68798a62634e58e01d6f1de509b253dcb40625bd (diff) |
cfg80211: enable 5 GHz world roaming channels
The current static world regulatory domain is too restrictive,
we can use some 5 GHz channels world wide so long as they do not
touch frequencies which require DFS. The compromise is we must
also enforce passive scanning and disallow usage of a mode of
operation that beacons: (AP | IBSS | Mesh)
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/reg.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 85c2c31721ec..da2a8aca4280 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -73,11 +73,22 @@ static spinlock_t reg_requests_lock; | |||
73 | 73 | ||
74 | /* We keep a static world regulatory domain in case of the absence of CRDA */ | 74 | /* We keep a static world regulatory domain in case of the absence of CRDA */ |
75 | static const struct ieee80211_regdomain world_regdom = { | 75 | static const struct ieee80211_regdomain world_regdom = { |
76 | .n_reg_rules = 1, | 76 | .n_reg_rules = 3, |
77 | .alpha2 = "00", | 77 | .alpha2 = "00", |
78 | .reg_rules = { | 78 | .reg_rules = { |
79 | /* IEEE 802.11b/g, channels 1..11 */ | 79 | /* IEEE 802.11b/g, channels 1..11 */ |
80 | REG_RULE(2412-10, 2462+10, 40, 6, 20, 0), | 80 | REG_RULE(2412-10, 2462+10, 40, 6, 20, 0), |
81 | /* IEEE 802.11a, channel 36..48 */ | ||
82 | REG_RULE(5180-10, 5240+10, 40, 6, 23, | ||
83 | NL80211_RRF_PASSIVE_SCAN | | ||
84 | NL80211_RRF_NO_IBSS), | ||
85 | |||
86 | /* NB: 5260 MHz - 5700 MHz requies DFS */ | ||
87 | |||
88 | /* IEEE 802.11a, channel 149..165 */ | ||
89 | REG_RULE(5745-10, 5825+10, 40, 6, 23, | ||
90 | NL80211_RRF_PASSIVE_SCAN | | ||
91 | NL80211_RRF_NO_IBSS), | ||
81 | } | 92 | } |
82 | }; | 93 | }; |
83 | 94 | ||