aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-10-26 13:25:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-26 13:38:52 -0400
commit44a504c405ae5c3a80e71acf71d6b1cb0db70715 (patch)
tree043c7da028ae67676cf221e76cbc767eddfe8d07 /net
parent2077776641b6ffb0049f13018d2e162340ec51c7 (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/Kconfig11
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
16 16
17config WIRELESS_OLD_REGULATORY 17config WIRELESS_OLD_REGULATORY
18 bool "Old wireless static regulatory definitions" 18 bool "Old wireless static regulatory definitions"
19 default n 19 default y
20 ---help--- 20 ---help---
21 This option enables the old static regulatory information 21 This option enables the old static regulatory information
22 and uses it within the new framework. This is available 22 and uses it within the new framework. This is available
@@ -40,11 +40,10 @@ config WIRELESS_OLD_REGULATORY
40 ieee80211_regdom module parameter. This is being phased out and you 40 ieee80211_regdom module parameter. This is being phased out and you
41 should stop using them ASAP. 41 should stop using them ASAP.
42 42
43 Say N unless you cannot install a new userspace application 43 Say Y unless you have installed a new userspace application.
44 or have one currently depending on the ieee80211_regdom module 44 Also say Y if have one currently depending on the ieee80211_regdom
45 parameter and cannot port it to use the new userspace interfaces. 45 module parameter and cannot port it to use the new userspace
46 46 interfaces.
47 This is scheduled for removal for 2.6.29.
48 47
49config WIRELESS_EXT 48config WIRELESS_EXT
50 bool "Wireless extensions" 49 bool "Wireless extensions"