[PATCH wireless-next 4/6] wifi: ipw2x00: Depend on MAC80211

[Eric Biggers <ebiggers@kernel.org>]

While the ipw2100 and ipw2200 hardware is "Full MAC" in the sense that
it handles management frames (like association and scanning), it doesn't
implement various cryptographic protocols, such as the Michael MIC
algorithm used in the (deprecated) TKIP.

Currently ipw2x00 accesses Michael MIC via the crypto_shash API.  Yet,
the mac80211 module already has its own Michael MIC implementation.
ipw2x00 is the only code in the kernel tree that needs a Michael MIC
implementation that doesn't already depend on CONFIG_MAC80211.

Just add the dependency on MAC80211 so that we'll be able to consolidate
the Michael MIC code in mac80211 and remove it from crypto_shash.

Alternatives considered:

  - Move michael_mic() from mac80211 to cfg80211.  Probably not worth it
    just for ipw2x00.

  - Move michael_mic() to its own independent module.  Again, probably
    not worth it just for ipw2x00.

  - Copy michael_mic() into ipw2x00.  It seems better to avoid the
    duplicate copy.

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
---
 drivers/net/wireless/intel/ipw2x00/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/intel/ipw2x00/Kconfig b/drivers/net/wireless/intel/ipw2x00/Kconfig
index b92df91adb3a4..13d69f94c889a 100644
--- a/drivers/net/wireless/intel/ipw2x00/Kconfig
+++ b/drivers/net/wireless/intel/ipw2x00/Kconfig
@@ -3,11 +3,11 @@
 # Intel Centrino wireless drivers
 #
 
 config IPW2100
 	tristate "Intel PRO/Wireless 2100 Network Connection"
-	depends on PCI && CFG80211
+	depends on PCI && MAC80211
 	select WIRELESS_EXT
 	select WEXT_PRIV
 	select FW_LOADER
 	select LIBIPW
 	help
@@ -62,11 +62,11 @@ config IPW2100_DEBUG
 	  If you are not trying to debug or develop the IPW2100 driver, you
 	  most likely want to say N here.
 
 config IPW2200
 	tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
-	depends on PCI && CFG80211
+	depends on PCI && MAC80211
 	select WIRELESS_EXT
 	select WEXT_PRIV
 	select FW_LOADER
 	select LIBIPW
 	help
@@ -149,11 +149,11 @@ config IPW2200_DEBUG
 
 	  If you are not sure, say N here.
 
 config LIBIPW
 	tristate
-	depends on PCI && CFG80211
+	depends on PCI && MAC80211
 	select WIRELESS_EXT
 	select CRYPTO
 	select CRYPTO_MICHAEL_MIC
 	select CRYPTO_LIB_ARC4
 	select CRC32
-- 
2.53.0