diff mbox series

iwlwifi: mei: fix building iwlmei

Message ID 20220316183617.1470631-1-arnd@kernel.org (mailing list archive)
State Accepted
Commit 066291bec0c55315e568ead501bebdefcb8453d2
Delegated to: Kalle Valo
Headers show
Series iwlwifi: mei: fix building iwlmei | expand

Commit Message

Arnd Bergmann March 16, 2022, 6:36 p.m. UTC
From: Arnd Bergmann <arnd@arndb.de>

Building iwlmei without CONFIG_CFG80211 causes a link-time warning:

ld.lld: error: undefined symbol: ieee80211_hdrlen
>>> referenced by net.c
>>>               net/wireless/intel/iwlwifi/mei/net.o:(iwl_mei_tx_copy_to_csme) in archive drivers/built-in.a

Add an explicit dependency to avoid this. In theory it should not
be needed here, but it also seems pointless to allow IWLMEI
for configurations without CFG80211.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/wireless/intel/iwlwifi/Kconfig | 1 +
 1 file changed, 1 insertion(+)

I see this warning on 5.17-rc8, but did not test it on linux-next,
which may already have a fix.

Comments

Kalle Valo March 16, 2022, 6:53 p.m. UTC | #1
Arnd Bergmann <arnd@kernel.org> writes:

> From: Arnd Bergmann <arnd@arndb.de>
>
> Building iwlmei without CONFIG_CFG80211 causes a link-time warning:
>
> ld.lld: error: undefined symbol: ieee80211_hdrlen
>>>> referenced by net.c
>>>>               net/wireless/intel/iwlwifi/mei/net.o:(iwl_mei_tx_copy_to_csme)
>>>> in archive drivers/built-in.a
>
> Add an explicit dependency to avoid this. In theory it should not
> be needed here, but it also seems pointless to allow IWLMEI
> for configurations without CFG80211.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/net/wireless/intel/iwlwifi/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> I see this warning on 5.17-rc8, but did not test it on linux-next,
> which may already have a fix.

I just sent the last pull request to v5.17. Luca, should I take this to
wireless-next? Ack?
Emmanuel Grumbach March 16, 2022, 6:55 p.m. UTC | #2
> 
> From: Arnd Bergmann <arnd@arndb.de>
> 
> Building iwlmei without CONFIG_CFG80211 causes a link-time warning:
> 
> ld.lld: error: undefined symbol: ieee80211_hdrlen
> >>> referenced by net.c
> >>>
> >>> net/wireless/intel/iwlwifi/mei/net.o:(iwl_mei_tx_copy_to_csme) in
> >>> archive drivers/built-in.a
> 
> Add an explicit dependency to avoid this. In theory it should not be needed
> here, but it also seems pointless to allow IWLMEI for configurations without
> CFG80211.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/net/wireless/intel/iwlwifi/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> I see this warning on 5.17-rc8, but did not test it on linux-next, which may
> already have a fix.
> 
> diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig
> b/drivers/net/wireless/intel/iwlwifi/Kconfig
> index 85e704283755..a647a406b87b 100644
> --- a/drivers/net/wireless/intel/iwlwifi/Kconfig
> +++ b/drivers/net/wireless/intel/iwlwifi/Kconfig
> @@ -139,6 +139,7 @@ config IWLMEI
>  	tristate "Intel Management Engine communication over WLAN"
>  	depends on INTEL_MEI
>  	depends on PM
> +	depends on CFG80211
>  	help
>  	  Enables the iwlmei kernel module.
> 

FWIW: Luca just merged the exact same patch internally. So
Acked-by: Emmanuel Grumbach <Emmanuel.grumbach@intel.com>
Luca Coelho March 17, 2022, 11:06 a.m. UTC | #3
On Wed, 2022-03-16 at 18:55 +0000, Grumbach, Emmanuel wrote:
> > 
> > From: Arnd Bergmann <arnd@arndb.de>
> > 
> > Building iwlmei without CONFIG_CFG80211 causes a link-time warning:
> > 
> > ld.lld: error: undefined symbol: ieee80211_hdrlen
> > > > > referenced by net.c
> > > > > 
> > > > > net/wireless/intel/iwlwifi/mei/net.o:(iwl_mei_tx_copy_to_csme
> > > > > ) in
> > > > > archive drivers/built-in.a
> > 
> > Add an explicit dependency to avoid this. In theory it should not
> > be needed
> > here, but it also seems pointless to allow IWLMEI for
> > configurations without
> > CFG80211.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> >  drivers/net/wireless/intel/iwlwifi/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > I see this warning on 5.17-rc8, but did not test it on linux-next,
> > which may
> > already have a fix.
> > 
> > diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig
> > b/drivers/net/wireless/intel/iwlwifi/Kconfig
> > index 85e704283755..a647a406b87b 100644
> > --- a/drivers/net/wireless/intel/iwlwifi/Kconfig
> > +++ b/drivers/net/wireless/intel/iwlwifi/Kconfig
> > @@ -139,6 +139,7 @@ config IWLMEI
> >  	tristate "Intel Management Engine communication over WLAN"
> >  	depends on INTEL_MEI
> >  	depends on PM
> > +	depends on CFG80211
> >  	help
> >  	  Enables the iwlmei kernel module.
> > 
> 
> FWIW: Luca just merged the exact same patch internally. So
> Acked-by: Emmanuel Grumbach <Emmanuel.grumbach@intel.com>

Yeah, please take this.

Acked-by: Luca Coelho <luciano.coelho@intel.com>

--
Cheers,
Luca.
Kalle Valo March 17, 2022, 2:15 p.m. UTC | #4
Arnd Bergmann <arnd@kernel.org> wrote:

> From: Arnd Bergmann <arnd@arndb.de>
> 
> Building iwlmei without CONFIG_CFG80211 causes a link-time warning:
> 
> ld.lld: error: undefined symbol: ieee80211_hdrlen
> >>> referenced by net.c
> >>>               net/wireless/intel/iwlwifi/mei/net.o:(iwl_mei_tx_copy_to_csme) in archive drivers/built-in.a
> 
> Add an explicit dependency to avoid this. In theory it should not
> be needed here, but it also seems pointless to allow IWLMEI
> for configurations without CFG80211.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Acked-by: Emmanuel Grumbach <Emmanuel.grumbach@intel.com>
> Acked-by: Luca Coelho <luciano.coelho@intel.com>

Patch applied to wireless-next.git, thanks.

066291bec0c5 iwlwifi: mei: fix building iwlmei
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig
index 85e704283755..a647a406b87b 100644
--- a/drivers/net/wireless/intel/iwlwifi/Kconfig
+++ b/drivers/net/wireless/intel/iwlwifi/Kconfig
@@ -139,6 +139,7 @@  config IWLMEI
 	tristate "Intel Management Engine communication over WLAN"
 	depends on INTEL_MEI
 	depends on PM
+	depends on CFG80211
 	help
 	  Enables the iwlmei kernel module.