diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-02-21 06:20:38 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 20:52:59 +0100 |
| commit | 3fc71f775af677f640f0f0780b16f1b0958f6d9d (patch) | |
| tree | 98a65f18760c15482b57f5f67ec3583a4611230f | |
| parent | cfg80211: enable active-scan / beaconing on Ch 1-11 for world regdom (diff) | |
| download | linux-3fc71f775af677f640f0f0780b16f1b0958f6d9d.tar.xz linux-3fc71f775af677f640f0f0780b16f1b0958f6d9d.zip | |
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>
| -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; /* We keep a static world regulatory domain in case of the absence of CRDA */ static const struct ieee80211_regdomain world_regdom = { - .n_reg_rules = 1, + .n_reg_rules = 3, .alpha2 = "00", .reg_rules = { /* IEEE 802.11b/g, channels 1..11 */ REG_RULE(2412-10, 2462+10, 40, 6, 20, 0), + /* IEEE 802.11a, channel 36..48 */ + REG_RULE(5180-10, 5240+10, 40, 6, 23, + NL80211_RRF_PASSIVE_SCAN | + NL80211_RRF_NO_IBSS), + + /* NB: 5260 MHz - 5700 MHz requies DFS */ + + /* IEEE 802.11a, channel 149..165 */ + REG_RULE(5745-10, 5825+10, 40, 6, 23, + NL80211_RRF_PASSIVE_SCAN | + NL80211_RRF_NO_IBSS), } }; |