diff options
| author | Loic Poulain <loic.poulain@linaro.org> | 2021-06-14 19:56:36 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-14 23:17:10 +0300 |
| commit | 89212e160b81e778f829b89743570665810e3b13 (patch) | |
| tree | 7a4641d1559eaa9b32b7f6e5c6e2c9a0dab989ae | |
| parent | ec13357263fb672390250fcfaa4c86b6dce66062 (diff) | |
| download | linux-89212e160b81e778f829b89743570665810e3b13.tar.xz | |
net: wwan: Fix WWAN config symbols
There is not strong reason to have both WWAN and WWAN_CORE symbols,
Let's build the WWAN core framework when WWAN is selected, in the
same way as for other subsystems.
This fixes issue with mhi_net selecting WWAN_CORE without WWAN and
reported by kernel test robot:
Kconfig warnings: (for reference only)
WARNING: unmet direct dependencies detected for WWAN_CORE
Depends on NETDEVICES && WWAN
Selected by
- MHI_NET && NETDEVICES && NET_CORE && MHI_BUS
Fixes: 9a44c1cc6388 ("net: Add a WWAN subsystem")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/wwan/Kconfig | 17 | ||||
| -rw-r--r-- | drivers/net/wwan/Makefile | 2 |
3 files changed, 8 insertions, 13 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 30d6e2f7686e..6977f8248df7 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -431,7 +431,7 @@ config VSOCKMON config MHI_NET tristate "MHI network driver" depends on MHI_BUS - select WWAN_CORE + select WWAN help This is the network driver for MHI bus. It can be used with QCOM based WWAN modems (like SDX55). Say Y or M. diff --git a/drivers/net/wwan/Kconfig b/drivers/net/wwan/Kconfig index 13613a4f53d8..249b3f1ed62b 100644 --- a/drivers/net/wwan/Kconfig +++ b/drivers/net/wwan/Kconfig @@ -3,15 +3,9 @@ # Wireless WAN device configuration # -menuconfig WWAN - bool "Wireless WAN" - help - This section contains Wireless WAN configuration for WWAN framework - and drivers. - -if WWAN +menu "Wireless WAN" -config WWAN_CORE +config WWAN tristate "WWAN Driver Core" help Say Y here if you want to use the WWAN driver core. This driver @@ -20,9 +14,10 @@ config WWAN_CORE To compile this driver as a module, choose M here: the module will be called wwan. +if WWAN + config WWAN_HWSIM tristate "Simulated WWAN device" - depends on WWAN_CORE help This driver is a developer testing tool that can be used to test WWAN framework. @@ -32,7 +27,6 @@ config WWAN_HWSIM config MHI_WWAN_CTRL tristate "MHI WWAN control driver for QCOM-based PCIe modems" - select WWAN_CORE depends on MHI_BUS help MHI WWAN CTRL allows QCOM-based PCIe modems to expose different modem @@ -46,7 +40,6 @@ config MHI_WWAN_CTRL config IOSM tristate "IOSM Driver for Intel M.2 WWAN Device" - select WWAN_CORE depends on INTEL_IOMMU help This driver enables Intel M.2 WWAN Device communication. @@ -57,3 +50,5 @@ config IOSM If unsure, say N. endif # WWAN + +endmenu diff --git a/drivers/net/wwan/Makefile b/drivers/net/wwan/Makefile index 3e565d3f984f..83dd3482ffc3 100644 --- a/drivers/net/wwan/Makefile +++ b/drivers/net/wwan/Makefile @@ -3,7 +3,7 @@ # Makefile for the Linux WWAN device drivers. # -obj-$(CONFIG_WWAN_CORE) += wwan.o +obj-$(CONFIG_WWAN) += wwan.o wwan-objs += wwan_core.o obj-$(CONFIG_WWAN_HWSIM) += wwan_hwsim.o |