Skip to contentSkip to conversation

cfg80211: remove CONFIG_WIRELESS_OLD_REGULATORY

PATCH New Luis R. Rodriguez 1 participant 1 message Mar 21, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 5/5 cfg80211: remove CONFIG_WIRELESS_OLD_REGULATORY

Distributions are already shipping with this disabled and we now have improved world roaming considerably.

---

This s/wireless roaming/world roaming/
as caught by johill on my v1 patch. No other patch changes were made.

 Documentation/feature-removal-schedule.txt |   16 ---
 net/wireless/Kconfig                       |   33 -------
 net/wireless/nl80211.c                     |    6 -
 net/wireless/reg.c                         |  144 +--------------------------
 4 files changed, 6 insertions(+), 193 deletions(-)
Documentation/feature-removal-schedule.txt +0 -16
index 020bc66..49dc5c5 100644
@@ -30,22 +30,6 @@ Who:	Luis R. Rodriguez <[email protected]>
 
 ---------------------------
 
-What:	old static regulatory information
-When:	2.6.29
-Why:	The old regulatory infrastructure has been replaced with a new one
-	which does not require statically defined regulatory domains. We do
-	not want to keep static regulatory domains in the kernel due to the
-	the dynamic nature of regulatory law and localization. We kept around
-	the old static definitions for the regulatory domains of:
-		* US
-		* JP
-		* EU
-	and used by default the US when CONFIG_WIRELESS_OLD_REGULATORY was
-	set.
-Who:	Luis R. Rodriguez <[email protected]>
-
----------------------------
-
 What:	dev->power.power_state
 When:	July 2007
 Why:	Broken design for runtime control over driver power states, confusing
net/wireless/Kconfig +0 -33
index d1d18f3..defa802 100644
@@ -10,39 +10,6 @@ config CFG80211_REG_DEBUG
 
 	  If unsure, say N.
 
-config WIRELESS_OLD_REGULATORY
-	bool "Old wireless static regulatory definitions"
-	default y
-	---help---
-	  This option enables the old static regulatory information
-	  and uses it within the new framework. This is available
-	  temporarily as an option to help prevent immediate issues
-	  due to the switch to the new regulatory framework which
-	  does require a new userspace application which has the
-	  database of regulatory information (CRDA) and another for
-	  setting regulatory domains (iw).
-
-	  For more information see:
-
-	  http://wireless.kernel.org/en/developers/Regulatory/CRDA
-	  http://wireless.kernel.org/en/users/Documentation/iw
-
-	  It is important to note though that if you *do* have CRDA present
-	  and if this option is enabled CRDA *will* be called to update the
-	  regulatory domain (for US and JP only). Support for letting the user
-	  set the regulatory domain through iw is also supported. This option
-	  mainly exists to leave around for a kernel release some old static
-	  regulatory domains that were defined and to keep around the old
-	  ieee80211_regdom module parameter. This is being phased out and you
-	  should stop using them ASAP.
-
-	  Note: You will need CRDA if you want 802.11d support
-
-	  Say Y unless you have installed a new userspace application.
-	  Also say Y if have one currently depending on the ieee80211_regdom
-	  module parameter and cannot port it to use the new userspace
-	  interfaces.
-
 config WIRELESS_EXT
 	bool "Wireless extensions"
 	default n
net/wireless/nl80211.c +0 -6
index a81a499..6f95975 100644
@@ -2058,12 +2058,6 @@ static int nl80211_req_set_reg(struct sk_buff *skb, struct genl_info *info)
 
 	data = nla_data(info->attrs[NL80211_ATTR_REG_ALPHA2]);
 
-#ifdef CONFIG_WIRELESS_OLD_REGULATORY
-	/* We ignore world regdom requests with the old regdom setup */
-	if (is_world_regdom(data))
-		return -EINVAL;
-#endif
-
 	r = regulatory_hint_user(data);
 
 	return r;
net/wireless/reg.c +6 -138

188 lines not on this page · raw message

Signature · 1 line
1.6.0.6