cfg80211: fix Kconfig for users of cfg80211

 * iwm doesn't depend on cfg80211 or wireless extensions
 * rndis wlan selects cfg80211 - needs to depend
 * mac80211 selects cfg80211 - needs to depend

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 867324163ca26c64338edc0f97dfac3586398afd..daf4c805be58b134b7be46030fd94f7f17d37f71 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -333,11 +333,11 @@ config USB_ZD1201
 config USB_NET_RNDIS_WLAN
        tristate "Wireless RNDIS USB support"
        depends on USB && WLAN_80211 && EXPERIMENTAL
+       depends on CFG80211
        select USB_USBNET
        select USB_NET_CDCETHER
        select USB_NET_RNDIS_HOST
        select WIRELESS_EXT
-       select CFG80211
        ---help---
          This is a driver for wireless RNDIS devices.
          These are USB based adapters found in devices such as:

diff --git a/drivers/net/wireless/iwmc3200wifi/Kconfig b/drivers/net/wireless/iwmc3200wifi/Kconfig
index a907aa9eff6231216d81de6516cf431a7fa05d27..1eccb6df46dd948664d75470172532b60211e6d4 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/Kconfig
+++ b/drivers/net/wireless/iwmc3200wifi/Kconfig
@@ -1,8 +1,8 @@
 config IWM
        tristate "Intel Wireless Multicomm 3200 WiFi driver"
        depends on MMC && WLAN_80211 && EXPERIMENTAL
+       depends on CFG80211
        select WIRELESS_EXT
-       select CFG80211
        select FW_LOADER
 
 config IWM_DEBUG

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 9cbf545e95a229755f1de7d0d17851f23ecab96c..ba2643a43c73c662236ad8f79144dba39d5dcfad 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -1,16 +1,19 @@
 config MAC80211
        tristate "Generic IEEE 802.11 Networking Stack (mac80211)"
+       depends on CFG80211
        select CRYPTO
        select CRYPTO_ECB
        select CRYPTO_ARC4
        select CRYPTO_AES
        select CRC32
        select WIRELESS_EXT
-       select CFG80211
        ---help---
          This option enables the hardware independent IEEE 802.11
          networking stack.
 
+comment "CFG80211 needs to be enabled for MAC80211"
+       depends on CFG80211=n
+
 config MAC80211_DEFAULT_PS
        bool "enable powersave by default"
        depends on MAC80211