diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/wireless/reg.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 9afc9168748b..ac048a158d85 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -122,9 +122,14 @@ static const struct ieee80211_regdomain *cfg80211_world_regdom = | |||
122 | 122 | ||
123 | #ifdef CONFIG_WIRELESS_OLD_REGULATORY | 123 | #ifdef CONFIG_WIRELESS_OLD_REGULATORY |
124 | static char *ieee80211_regdom = "US"; | 124 | static char *ieee80211_regdom = "US"; |
125 | #else | ||
126 | static char *ieee80211_regdom = "00"; | ||
127 | #endif | ||
128 | |||
125 | module_param(ieee80211_regdom, charp, 0444); | 129 | module_param(ieee80211_regdom, charp, 0444); |
126 | MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain code"); | 130 | MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain code"); |
127 | 131 | ||
132 | #ifdef CONFIG_WIRELESS_OLD_REGULATORY | ||
128 | /* | 133 | /* |
129 | * We assume 40 MHz bandwidth for the old regulatory work. | 134 | * We assume 40 MHz bandwidth for the old regulatory work. |
130 | * We make emphasis we are using the exact same frequencies | 135 | * We make emphasis we are using the exact same frequencies |
@@ -2152,7 +2157,7 @@ int regulatory_init(void) | |||
2152 | #else | 2157 | #else |
2153 | cfg80211_regdomain = cfg80211_world_regdom; | 2158 | cfg80211_regdomain = cfg80211_world_regdom; |
2154 | 2159 | ||
2155 | err = regulatory_hint_core("00"); | 2160 | err = regulatory_hint_core(ieee80211_regdom); |
2156 | #endif | 2161 | #endif |
2157 | if (err) { | 2162 | if (err) { |
2158 | if (err == -ENOMEM) | 2163 | if (err == -ENOMEM) |