aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/core.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index a910cd2d0fd1..59e4d7debf02 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -41,7 +41,7 @@ const struct ieee80211_regdomain world_regdom = {
41 .n_reg_rules = 1, 41 .n_reg_rules = 1,
42 .alpha2 = "00", 42 .alpha2 = "00",
43 .reg_rules = { 43 .reg_rules = {
44 REG_RULE(2402, 2472, 40, 6, 20, 44 REG_RULE(2412-10, 2462+10, 40, 6, 20,
45 NL80211_RRF_PASSIVE_SCAN | 45 NL80211_RRF_PASSIVE_SCAN |
46 NL80211_RRF_NO_IBSS), 46 NL80211_RRF_NO_IBSS),
47 } 47 }
@@ -64,17 +64,17 @@ const struct ieee80211_regdomain us_regdom = {
64 .alpha2 = "US", 64 .alpha2 = "US",
65 .reg_rules = { 65 .reg_rules = {
66 /* IEEE 802.11b/g, channels 1..11 */ 66 /* IEEE 802.11b/g, channels 1..11 */
67 REG_RULE(2412-20, 2462+20, 40, 6, 27, 0), 67 REG_RULE(2412-10, 2462+10, 40, 6, 27, 0),
68 /* IEEE 802.11a, channel 36 */ 68 /* IEEE 802.11a, channel 36 */
69 REG_RULE(5180-20, 5180+20, 40, 6, 23, 0), 69 REG_RULE(5180-10, 5180+10, 40, 6, 23, 0),
70 /* IEEE 802.11a, channel 40 */ 70 /* IEEE 802.11a, channel 40 */
71 REG_RULE(5200-20, 5200+20, 40, 6, 23, 0), 71 REG_RULE(5200-10, 5200+10, 40, 6, 23, 0),
72 /* IEEE 802.11a, channel 44 */ 72 /* IEEE 802.11a, channel 44 */
73 REG_RULE(5220-20, 5220+20, 40, 6, 23, 0), 73 REG_RULE(5220-10, 5220+10, 40, 6, 23, 0),
74 /* IEEE 802.11a, channels 48..64 */ 74 /* IEEE 802.11a, channels 48..64 */
75 REG_RULE(5240-20, 5320+20, 40, 6, 23, 0), 75 REG_RULE(5240-10, 5320+10, 40, 6, 23, 0),
76 /* IEEE 802.11a, channels 149..165, outdoor */ 76 /* IEEE 802.11a, channels 149..165, outdoor */
77 REG_RULE(5745-20, 5825+20, 40, 6, 30, 0), 77 REG_RULE(5745-10, 5825+10, 40, 6, 30, 0),
78 } 78 }
79}; 79};
80 80
@@ -83,12 +83,12 @@ const struct ieee80211_regdomain jp_regdom = {
83 .alpha2 = "JP", 83 .alpha2 = "JP",
84 .reg_rules = { 84 .reg_rules = {
85 /* IEEE 802.11b/g, channels 1..14 */ 85 /* IEEE 802.11b/g, channels 1..14 */
86 REG_RULE(2412-20, 2484+20, 40, 6, 20, 0), 86 REG_RULE(2412-10, 2484+10, 40, 6, 20, 0),
87 /* IEEE 802.11a, channels 34..48 */ 87 /* IEEE 802.11a, channels 34..48 */
88 REG_RULE(5170-20, 5240+20, 40, 6, 20, 88 REG_RULE(5170-10, 5240+10, 40, 6, 20,
89 NL80211_RRF_PASSIVE_SCAN), 89 NL80211_RRF_PASSIVE_SCAN),
90 /* IEEE 802.11a, channels 52..64 */ 90 /* IEEE 802.11a, channels 52..64 */
91 REG_RULE(5260-20, 5320+20, 40, 6, 20, 91 REG_RULE(5260-10, 5320+10, 40, 6, 20,
92 NL80211_RRF_NO_IBSS | 92 NL80211_RRF_NO_IBSS |
93 NL80211_RRF_DFS), 93 NL80211_RRF_DFS),
94 } 94 }
@@ -101,22 +101,22 @@ const struct ieee80211_regdomain eu_regdom = {
101 .alpha2 = "EU", 101 .alpha2 = "EU",
102 .reg_rules = { 102 .reg_rules = {
103 /* IEEE 802.11b/g, channels 1..13 */ 103 /* IEEE 802.11b/g, channels 1..13 */
104 REG_RULE(2412-20, 2472+20, 40, 6, 20, 0), 104 REG_RULE(2412-10, 2472+10, 40, 6, 20, 0),
105 /* IEEE 802.11a, channel 36 */ 105 /* IEEE 802.11a, channel 36 */
106 REG_RULE(5180-20, 5180+20, 40, 6, 23, 106 REG_RULE(5180-10, 5180+10, 40, 6, 23,
107 NL80211_RRF_PASSIVE_SCAN), 107 NL80211_RRF_PASSIVE_SCAN),
108 /* IEEE 802.11a, channel 40 */ 108 /* IEEE 802.11a, channel 40 */
109 REG_RULE(5200-20, 5200+20, 40, 6, 23, 109 REG_RULE(5200-10, 5200+10, 40, 6, 23,
110 NL80211_RRF_PASSIVE_SCAN), 110 NL80211_RRF_PASSIVE_SCAN),
111 /* IEEE 802.11a, channel 44 */ 111 /* IEEE 802.11a, channel 44 */
112 REG_RULE(5220-20, 5220+20, 40, 6, 23, 112 REG_RULE(5220-10, 5220+10, 40, 6, 23,
113 NL80211_RRF_PASSIVE_SCAN), 113 NL80211_RRF_PASSIVE_SCAN),
114 /* IEEE 802.11a, channels 48..64 */ 114 /* IEEE 802.11a, channels 48..64 */
115 REG_RULE(5240-20, 5320+20, 40, 6, 20, 115 REG_RULE(5240-10, 5320+10, 40, 6, 20,
116 NL80211_RRF_NO_IBSS | 116 NL80211_RRF_NO_IBSS |
117 NL80211_RRF_DFS), 117 NL80211_RRF_DFS),
118 /* IEEE 802.11a, channels 100..140 */ 118 /* IEEE 802.11a, channels 100..140 */
119 REG_RULE(5500-20, 5700+20, 40, 6, 30, 119 REG_RULE(5500-10, 5700+10, 40, 6, 30,
120 NL80211_RRF_NO_IBSS | 120 NL80211_RRF_NO_IBSS |
121 NL80211_RRF_DFS), 121 NL80211_RRF_DFS),
122 } 122 }