From b74a841d1cfc02508977da0d86f246bba220150f Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Wed, 12 Feb 2020 12:10:37 -0800 Subject: [PATCH] qcacld-3.0: Conditionally enable WEXT support Currently CONFIG_WLAN_WEXT_SUPPORT_ENABLE is unconditionally enabled in many defconfigs, including the default defconfig, but this leads to build failures when WEXT is not configured in the Kernel. So update the defconfigs to enable CONFIG_WLAN_WEXT_SUPPORT_ENABLE only when CONFIG_WIRELESS_EXT is enabled in the Kernel. Change-Id: Iecfd4e899c2b09c489547dd1a8ff70f71983853f CRs-Fixed: 2620792 --- configs/default_defconfig | 2 ++ configs/genoa.common | 2 ++ configs/qca6174_defconfig | 2 ++ configs/qca6390_defconfig | 2 ++ 4 files changed, 8 insertions(+) diff --git a/configs/default_defconfig b/configs/default_defconfig index a6ec72636856..7de7a0bb433c 100644 --- a/configs/default_defconfig +++ b/configs/default_defconfig @@ -780,7 +780,9 @@ CONFIG_FEATURE_ROAM_DEBUG := y CONFIG_WLAN_DFS_MASTER_ENABLE := y #Flag to enable WEXT support for STA/AP/P2P interfaces +ifeq ($(CONFIG_WIRELESS_EXT), y) CONFIG_WLAN_WEXT_SUPPORT_ENABLE := y +endif #Flag to enable/disable MTRACE feature CONFIG_ENABLE_MTRACE_LOG := y diff --git a/configs/genoa.common b/configs/genoa.common index 85f8a938af11..e7b9b2d58f42 100644 --- a/configs/genoa.common +++ b/configs/genoa.common @@ -50,7 +50,9 @@ CONFIG_QCACLD_FEATURE_METERING := n CONFIG_WLAN_DYNAMIC_CVM := n #We might need to disable WEXT support in perf builds in future +ifeq ($(CONFIG_WIRELESS_EXT), y) CONFIG_WLAN_WEXT_SUPPORT_ENABLE := y +endif CONFIG_HOST_11D_SCAN := y #Flag to enable/disable Avoid acs freq feature diff --git a/configs/qca6174_defconfig b/configs/qca6174_defconfig index b36f6feadddf..064c8c005028 100644 --- a/configs/qca6174_defconfig +++ b/configs/qca6174_defconfig @@ -564,7 +564,9 @@ CONFIG_FEATURE_ROAM_DEBUG := y CONFIG_WLAN_DFS_MASTER_ENABLE := y #Flag to enable WEXT support for STA/AP/P2P interfaces +ifeq ($(CONFIG_WIRELESS_EXT), y) CONFIG_WLAN_WEXT_SUPPORT_ENABLE := y +endif #Flag to enable/disable MTRACE feature CONFIG_ENABLE_MTRACE_LOG := y diff --git a/configs/qca6390_defconfig b/configs/qca6390_defconfig index c0ea6946c260..f2368355a8e1 100644 --- a/configs/qca6390_defconfig +++ b/configs/qca6390_defconfig @@ -596,7 +596,9 @@ CONFIG_FEATURE_ROAM_DEBUG := y CONFIG_WLAN_DFS_MASTER_ENABLE := y #Flag to enable WEXT support for STA/AP/P2P interfaces +ifeq ($(CONFIG_WIRELESS_EXT), y) CONFIG_WLAN_WEXT_SUPPORT_ENABLE := y +endif #Flag to enable/disable MTRACE feature CONFIG_ENABLE_MTRACE_LOG := y