From fe6f0b0dc855b13ae3dab1566de31d307dbbf64d Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Wed, 11 Apr 2018 09:27:04 -0700 Subject: [PATCH] qcacld-3.0: Kbuild: Replace unnecessary references to CONFIG_ROME_IF In Kbuild CONFIG_ROME_IF is used to calculate the interface used by the WLAN hardware. Once this is determined, one of the boolean CONFIG_HIF_[PCI|USB|SDIO|SNOC|...] variables is configured. In anticipation of refactoring the Kbuild in a manner which will remove the necessity of having CONFIG_ROME_IF, replace all tests of CONFIG_ROME_IF with tests of CONFIG_HIF_* once the CONFIG_HIF_* variables have been set. Change-Id: If80d465500b6b99181d470fa6bff3dc8c20e4409 CRs-Fixed: 2222911 --- Kbuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Kbuild b/Kbuild index 54250dc92fae..d91ba1f09c05 100644 --- a/Kbuild +++ b/Kbuild @@ -372,7 +372,7 @@ CONFIG_CHECKSUM_OFFLOAD := y CONFIG_GTK_OFFLOAD := y #Enable EXT WOW -ifeq ($(CONFIG_ROME_IF),pci) +ifeq ($(CONFIG_HIF_PCI), y) CONFIG_EXT_WOW := y endif @@ -1926,7 +1926,7 @@ CDEFINES += -DWLAN_NL80211_TESTMODE endif # Flag to enable bus auto suspend -ifeq ($(CONFIG_ROME_IF),pci) +ifeq ($(CONFIG_HIF_PCI), y) ifeq ($(CONFIG_BUS_AUTO_SUSPEND), y) CDEFINES += -DFEATURE_RUNTIME_PM endif @@ -1980,7 +1980,7 @@ ifeq ($(CONFIG_WLAN_TX_FLOW_CONTROL_V2), y) CDEFINES += -DQCA_LL_TX_FLOW_CONTROL_V2 CDEFINES += -DQCA_LL_TX_FLOW_GLOBAL_MGMT_POOL else -ifeq ($(CONFIG_ROME_IF),pci) +ifeq ($(CONFIG_HIF_PCI), y) ifneq ($(CONFIG_LITHIUM), y) CDEFINES += -DQCA_LL_LEGACY_TX_FLOW_CONTROL endif @@ -2480,7 +2480,7 @@ endif #Flag to enable/disable WLAN D0-WOW ifeq ($(CONFIG_PCI_MSM), y) -ifeq ($(CONFIG_ROME_IF),pci) +ifeq ($(CONFIG_HIF_PCI), y) CDEFINES += -DFEATURE_WLAN_D0WOW endif endif