Move the wireless Kconfig options into their own wireless/Kconfig and add a CONFIG_NL80211 configuration option to allow nl80211 support to be optionally included (default =y) Signed-off-by: James Ketrenos <jketreno@xxxxxxxxxxxxxxx> --- net/Kconfig | 17 +---------------- net/wireless/Kconfig | 42 ++++++++++++++++++++++++++++++++++++++++++ net/wireless/Makefile | 3 ++- 3 files changed, 45 insertions(+), 17 deletions(-) --- diff --git a/net/Kconfig b/net/Kconfig index 969754f..218570b 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -227,22 +227,7 @@ config WIRELESS_EXT config FIB_RULES bool -config CFG80211 - tristate "Improved wireless configuration API" - -config CFG80211_WEXT_COMPAT - bool "cfg80211 Wireless Extensions compatibility" - depends CFG80211 - default y - ---help--- - This option allows using devices whose drivers have been - converted to use the new cfg80211 with wireless extensions, - providing WE-20 compatibility. Note that cfg80211's "native" - interface is nl80211 using generic netlink. The wireless - extensions are being deprecated, but userspace tools may still - be using them. - - If unsure, say Y. +source "net/wireless/Kconfig" endif # if NET endmenu # Networking diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig new file mode 100644 index 0000000..89308d0 --- /dev/null +++ b/net/wireless/Kconfig @@ -0,0 +1,42 @@ +config CFG80211 + tristate "Improved wireless configuration API" + select WIRELESS_EXT + +config CFG80211_WEXT_COMPAT + bool "cfg80211 Wireless Extensions compatibility" + depends CFG80211 + default y + ---help--- + This option allows using devices whose drivers have been + converted to use the new cfg80211 with wireless extensions, + providing WE-20 compatibility. + + Note that cfg80211's "native" interface is nl80211 using + generic netlink. The wireless extensions are being + deprecated, but userspace tools may still be using them. + + NOTE: wireless extension support (WIRELESS_EXT) is currently a + built-in based on 'Wireless Extension' support (selected + when CFG80211 is enabled). + + If unsure, say Y. + +config CFG80211_NL80211 + tristate "nl80211 new netlink interface support" + depends CFG80211 + default y + ---help--- + This option turns on the new netlink interface + (nl80211) support in cfg80211. + + If =n, drivers using d80211 will be configured via + wireless extension support provided by that subsystem. + + If =m, the module will be called nl80211.ko + + NOTE: wireless extension support (WIRELESS_EXT) is currently a + built-in based on 'Wireless Extension' support (selected + when CFG80211 is enabled). + + If unsure, say Y. + diff --git a/net/wireless/Makefile b/net/wireless/Makefile index c52c251..1f47511 100644 --- a/net/wireless/Makefile +++ b/net/wireless/Makefile @@ -1,6 +1,7 @@ obj-$(CONFIG_CFG80211) += cfg80211.o -cfg80211-y += core.o sysfs.o nl80211.o +cfg80211-y += core.o sysfs.o +cfg80211-$(CONFIG_NL80211) += nl80211.o cfg80211-$(CONFIG_CFG80211_WEXT_COMPAT) += wext-compat.o ifeq ($(CONFIG_CFG80211),m) - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
