From ec273f3f2eb8972d505c672d5d4e668cc0f53378 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 13 Apr 2018 20:40:05 -0700 Subject: [PATCH] qcacld-3.0: Kbuild: Define CONFIG_WLAN_LOGGING_SOCK_SVC Currently the switch -DWLAN_LOGGING_SOCK_SVC_ENABLE is inferred by examining a seemingly unrelated configuration option. In order to clearly separate setting the configuration from applying the configuration create a new CONFIG_WLAN_LOGGING_SOCK_SVC configuration parameter. Change-Id: Ic542512e3440453ef9f320297cf18f73f92fb2e3 CRs-Fixed: 2224810 --- Kbuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Kbuild b/Kbuild index f24817b00a72..049fc4df3a1f 100644 --- a/Kbuild +++ b/Kbuild @@ -545,6 +545,10 @@ CONFIG_FEATURE_WLAN_D0WOW := y endif endif +ifneq ($(CONFIG_HIF_USB), y) +CONFIG_WLAN_LOGGING_SOCK_SVC := y +endif + ############ UAPI ############ UAPI_DIR := uapi UAPI_INC := -I$(WLAN_ROOT)/$(UAPI_DIR)/linux @@ -1975,11 +1979,7 @@ ccflags-$(CONFIG_WIFI_POS_CONVERGED) += -DWIFI_POS_CONVERGED ccflags-$(CONFIG_WIFI_POS_LEGACY) += -DFEATURE_OEM_DATA_SUPPORT ccflags-$(CONFIG_FEATURE_HTC_CREDIT_HISTORY) += -DFEATURE_HTC_CREDIT_HISTORY ccflags-$(CONFIG_WLAN_FEATURE_P2P_DEBUG) += -DWLAN_FEATURE_P2P_DEBUG - -ifneq ($(CONFIG_HIF_USB), y) -ccflags-y += -DWLAN_LOGGING_SOCK_SVC_ENABLE -endif - +ccflags-$(CONFIG_WLAN_LOGGING_SOCK_SVC) += -DWLAN_LOGGING_SOCK_SVC_ENABLE ccflags-$(CONFIG_WLAN_FEATURE_FILS) += -DWLAN_FEATURE_FILS_SK ifeq ($(CONFIG_CNSS), y)