summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-03-05 21:19:21 -0800
committerJohn W. Linville <linville@tuxdriver.com>2009-03-16 18:09:29 -0400
commit611b6a82aaae33a4d3a274fd6cccbdcd1c7cef4d (patch)
treea36a4ec36991c680ceaa657512b27e0f00b27fde /net/wireless
parent22cad73587ac85e2e9d1f52aae62023aec093654 (diff)
downloadop-kernel-dev-611b6a82aaae33a4d3a274fd6cccbdcd1c7cef4d.zip
op-kernel-dev-611b6a82aaae33a4d3a274fd6cccbdcd1c7cef4d.tar.gz
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 58df98f..25eb155 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -86,15 +86,26 @@ struct reg_beacon {
/* We keep a static world regulatory domain in case of the absence of CRDA */
static const struct ieee80211_regdomain world_regdom = {
- .n_reg_rules = 3,
+ .n_reg_rules = 5,
.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,
+ /* IEEE 802.11b/g, channels 12..13. No HT40
+ * channel fits here. */
+ REG_RULE(2467-10, 2472+10, 20, 6, 20,
NL80211_RRF_PASSIVE_SCAN |
NL80211_RRF_NO_IBSS),
+ /* 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_PASSIVE_SCAN |
+ NL80211_RRF_NO_IBSS |
+ NL80211_RRF_NO_OFDM),
+ /* 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 */
OpenPOWER on IntegriCloud