diff mbox series

[for,v5.0] iwlwifi: make IWLWIFI depend on CFG80211

Message ID 20190114110023.23172-1-luca@coelho.fi (mailing list archive)
State Accepted
Commit ec5aecc0b227f5509d25853537f989ca303e2be1
Delegated to: Kalle Valo
Headers show
Series [for,v5.0] iwlwifi: make IWLWIFI depend on CFG80211 | expand

Commit Message

Luca Coelho Jan. 14, 2019, 11 a.m. UTC 
From: Luca Coelho <luciano.coelho@intel.com>

Since IWLWIFI doesn't depend on MAC80211 anymore, it needs to depend
on CFG80211, because it uses a few symbols from it.  Add the
dependency on CFG80211 accordingly.

Additionally, make IWLWIFI_LEDS depend on IWLMVM or IWLDVM, since it
doesn't need mac80211 but must be used for these.

Fixes: aca432f06b8a ("iwlwifi: make MVM and DVM depend on MAC80211")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Kalle Valo Jan. 16, 2019, 6:09 p.m. UTC | #1 
Luca Coelho <luca@coelho.fi> wrote:

> From: Luca Coelho <luciano.coelho@intel.com>
> 
> Since IWLWIFI doesn't depend on MAC80211 anymore, it needs to depend
> on CFG80211, because it uses a few symbols from it.  Add the
> dependency on CFG80211 accordingly.
> 
> Additionally, make IWLWIFI_LEDS depend on IWLMVM or IWLDVM, since it
> doesn't need mac80211 but must be used for these.
> 
> Fixes: aca432f06b8a ("iwlwifi: make MVM and DVM depend on MAC80211")
> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

Patch applied to wireless-drivers.git, thanks.

ec5aecc0b227 iwlwifi: make IWLWIFI depend on CFG80211
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig
index 491ca3c8b43c..83d5bceea08f 100644
--- a/drivers/net/wireless/intel/iwlwifi/Kconfig
+++ b/drivers/net/wireless/intel/iwlwifi/Kconfig
@@ -1,6 +1,6 @@ 
 config IWLWIFI
 	tristate "Intel Wireless WiFi Next Gen AGN - Wireless-N/Advanced-N/Ultimate-N (iwlwifi) "
-	depends on PCI && HAS_IOMEM
+	depends on PCI && HAS_IOMEM && CFG80211
 	select FW_LOADER
 	---help---
 	  Select to build the driver supporting the:
@@ -47,6 +47,7 @@  if IWLWIFI
 config IWLWIFI_LEDS
 	bool
 	depends on LEDS_CLASS=y || LEDS_CLASS=IWLWIFI
+	depends on IWLMVM || IWLDVM
 	select LEDS_TRIGGERS
 	select MAC80211_LEDS
 	default y