aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-03-06 00:19:21 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-03-16 18:09:29 -0400
commit611b6a82aaae33a4d3a274fd6cccbdcd1c7cef4d (patch)
treea36a4ec36991c680ceaa657512b27e0f00b27fde /net/wireless
parent22cad73587ac85e2e9d1f52aae62023aec093654 (diff)
cfg80211: Enable passive scan on channels 12-14 for world roaming
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.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 58df98f10990..25eb1554f8a6 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -86,15 +86,26 @@ struct reg_beacon {
86 86
87/* We keep a static world regulatory domain in case of the absence of CRDA */ 87/* We keep a static world regulatory domain in case of the absence of CRDA */
88static const struct ieee80211_regdomain world_regdom = { 88static const struct ieee80211_regdomain world_regdom = {
89 .n_reg_rules = 3, 89 .n_reg_rules = 5,
90 .alpha2 = "00", 90 .alpha2 = "00",
91 .reg_rules = { 91 .reg_rules = {
92 /* IEEE 802.11b/g, channels 1..11 */ 92 /* IEEE 802.11b/g, channels 1..11 */
93 REG_RULE(2412-10, 2462+10, 40, 6, 20, 0), 93 REG_RULE(2412-10, 2462+10, 40, 6, 20, 0),
94 /* IEEE 802.11a, channel 36..48 */ 94 /* IEEE 802.11b/g, channels 12..13. No HT40
95 REG_RULE(5180-10, 5240+10, 40, 6, 23, 95 * channel fits here. */
96 REG_RULE(2467-10, 2472+10, 20, 6, 20,
96 NL80211_RRF_PASSIVE_SCAN | 97 NL80211_RRF_PASSIVE_SCAN |
97 NL80211_RRF_NO_IBSS), 98 NL80211_RRF_NO_IBSS),
99 /* IEEE 802.11 channel 14 - Only JP enables
100 * this and for 802.11b only */
101 REG_RULE(2484-10, 2484+10, 20, 6, 20,
102 NL80211_RRF_PASSIVE_SCAN |
103 NL80211_RRF_NO_IBSS |
104 NL80211_RRF_NO_OFDM),
105 /* IEEE 802.11a, channel 36..48 */
106 REG_RULE(5180-10, 5240+10, 40, 6, 23,
107 NL80211_RRF_PASSIVE_SCAN |
108 NL80211_RRF_NO_IBSS),
98 109
99 /* NB: 5260 MHz - 5700 MHz requies DFS */ 110 /* NB: 5260 MHz - 5700 MHz requies DFS */
100 111