wireless: fix regression caused by regulatory config option

The default for the regulatory compatibility option is wrong;
if you picked the default you ended up with a non-functional wifi
system (at least I did on Fedora 9 with iwl4965).
I don't think even the October 2008 releases of the various distros
has the new userland so clearly the default is wrong, and also
we can't just go about deleting this in 2.6.29...

Change the default to "y" and also adjust the config text a little to
reflect this.

This patch fixes regression #11859

With thanks to Johannes Berg for the diagnostics

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 7d82be07fa1d..646c7121dbc0 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -16,7 +16,7 @@ config NL80211
 
 config WIRELESS_OLD_REGULATORY
         bool "Old wireless static regulatory definitions"
-        default n
+        default y
         ---help---
           This option enables the old static regulatory information
           and uses it within the new framework. This is available
@@ -40,11 +40,10 @@ config WIRELESS_OLD_REGULATORY
           ieee80211_regdom module parameter. This is being phased out and you
           should stop using them ASAP.
 
-          Say N unless you cannot install a new userspace application
-          or have one currently depending on the ieee80211_regdom module
-          parameter and cannot port it to use the new userspace interfaces.
-
-          This is scheduled for removal for 2.6.29.
+          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"