提交 6ee7d330 编写于 作者: L Luis R. Rodriguez 提交者: John W. Linville

cfg80211: make regdom module parameter available oustide of OLD_REG

It seems a few users are using this module parameter although its not
recommended. People are finding it useful despite there being utilities
for setting this in userspace. I'm not aware of any distribution using
this though.

Until userspace and distributions catch up with a default userspace
automatic replacement (GeoClue integration would be nirvana) we copy
the ieee80211_regdom module parameter from OLD_REG to the new reg
code to help these users migrate.

Users who are using the non-valid ISO / IEC 3166 alpha "EU" in their
ieee80211_regdom module parameter and migrate to non-OLD_REG enabled
system will world roam.

This also schedules removal of this same ieee80211_regdom module
parameter circa March 2010. Hope is by then nirvana is reached and
users will abandoned the module parameter completely.
Signed-off-by: NLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 cc0b6fe8
...@@ -6,7 +6,31 @@ be removed from this file. ...@@ -6,7 +6,31 @@ be removed from this file.
--------------------------- ---------------------------
What: old static regulatory information and ieee80211_regdom module parameter What: The ieee80211_regdom module parameter
When: March 2010
Why: This was inherited by the CONFIG_WIRELESS_OLD_REGULATORY code,
and currently serves as an option for users to define an
ISO / IEC 3166 alpha2 code for the country they are currently
present in. Although there are userspace API replacements for this
through nl80211 distributions haven't yet caught up with implementing
decent alternatives through standard GUIs. Although available as an
option through iw or wpa_supplicant its just a matter of time before
distributions pick up good GUI options for this. The ideal solution
would actually consist of intelligent designs which would do this for
the user automatically even when travelling through different countries.
Until then we leave this module parameter as a compromise.
When userspace improves with reasonable widely-available alternatives for
this we will no longer need this module parameter. This entry hopes that
by the super-futuristically looking date of "March 2010" we will have
such replacements widely available.
Who: Luis R. Rodriguez <lrodriguez@atheros.com>
---------------------------
What: old static regulatory information
When: 2.6.29 When: 2.6.29
Why: The old regulatory infrastructure has been replaced with a new one Why: The old regulatory infrastructure has been replaced with a new one
which does not require statically defined regulatory domains. We do which does not require statically defined regulatory domains. We do
...@@ -17,9 +41,7 @@ Why: The old regulatory infrastructure has been replaced with a new one ...@@ -17,9 +41,7 @@ Why: The old regulatory infrastructure has been replaced with a new one
* JP * JP
* EU * EU
and used by default the US when CONFIG_WIRELESS_OLD_REGULATORY was and used by default the US when CONFIG_WIRELESS_OLD_REGULATORY was
set. We also kept around the ieee80211_regdom module parameter in case set.
some applications were relying on it. Changing regulatory domains
can now be done instead by using nl80211, as is done with iw.
Who: Luis R. Rodriguez <lrodriguez@atheros.com> Who: Luis R. Rodriguez <lrodriguez@atheros.com>
--------------------------- ---------------------------
......
...@@ -122,9 +122,14 @@ static const struct ieee80211_regdomain *cfg80211_world_regdom = ...@@ -122,9 +122,14 @@ static const struct ieee80211_regdomain *cfg80211_world_regdom =
#ifdef CONFIG_WIRELESS_OLD_REGULATORY #ifdef CONFIG_WIRELESS_OLD_REGULATORY
static char *ieee80211_regdom = "US"; static char *ieee80211_regdom = "US";
#else
static char *ieee80211_regdom = "00";
#endif
module_param(ieee80211_regdom, charp, 0444); module_param(ieee80211_regdom, charp, 0444);
MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain code"); MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain code");
#ifdef CONFIG_WIRELESS_OLD_REGULATORY
/* /*
* We assume 40 MHz bandwidth for the old regulatory work. * We assume 40 MHz bandwidth for the old regulatory work.
* We make emphasis we are using the exact same frequencies * We make emphasis we are using the exact same frequencies
...@@ -2152,7 +2157,7 @@ int regulatory_init(void) ...@@ -2152,7 +2157,7 @@ int regulatory_init(void)
#else #else
cfg80211_regdomain = cfg80211_world_regdom; cfg80211_regdomain = cfg80211_world_regdom;
err = regulatory_hint_core("00"); err = regulatory_hint_core(ieee80211_regdom);
#endif #endif
if (err) { if (err) {
if (err == -ENOMEM) if (err == -ENOMEM)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册