From fb67f620c1cf3dc39c4359666c9af5aef9c66b15 Mon Sep 17 00:00:00 2001 From: Yu Ouyang Date: Mon, 9 Sep 2019 14:31:14 +0800 Subject: [PATCH] qcacld-3.0: Fix one potential wrong config CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY may be not set yes, if only CONFIG_ROME_IF is set pci in external file. Because it is set yes only when CONFIG_HIF_PCI set yes, however, CONFIG_HIF_PCI set yes after it. For example, in file default_defconfig, CONFIG_HIF_PCI set to yes on line 465, however line 311 checking CONFIG_HIF_PCI to enable CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY. So, line 314 can't be called, CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY is not set yes. Change "ifeq ($(CONFIG_HIF_PCI), y)" to "ifeq ($(CONFIG_ROME_IF),pci)" to avoid it. Change-Id: Id324cdb99d6ee2d20bc00e698836c3ea4c5e0a05 CRs-Fixed: 2496110 --- configs/default_defconfig | 2 +- configs/qca6174_defconfig | 2 +- configs/qca6390_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/default_defconfig b/configs/default_defconfig index ee791e1674fe..8843ccaace51 100644 --- a/configs/default_defconfig +++ b/configs/default_defconfig @@ -337,7 +337,7 @@ else CONFIG_LL_DP_SUPPORT := y endif -ifeq ($(CONFIG_HIF_PCI), y) +ifeq ($(CONFIG_ROME_IF),pci) ifneq ($(CONFIG_WLAN_TX_FLOW_CONTROL_V2), y) ifneq ($(CONFIG_LITHIUM), y) CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY := y diff --git a/configs/qca6174_defconfig b/configs/qca6174_defconfig index 8d13e22aa0ba..bb38ece59426 100644 --- a/configs/qca6174_defconfig +++ b/configs/qca6174_defconfig @@ -229,7 +229,7 @@ else CONFIG_LL_DP_SUPPORT := y endif -ifeq ($(CONFIG_HIF_PCI), y) +ifeq ($(CONFIG_ROME_IF),pci) ifneq ($(CONFIG_WLAN_TX_FLOW_CONTROL_V2), y) ifneq ($(CONFIG_LITHIUM), y) CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY := y diff --git a/configs/qca6390_defconfig b/configs/qca6390_defconfig index 8ba9b17e6b52..80082ff374e6 100644 --- a/configs/qca6390_defconfig +++ b/configs/qca6390_defconfig @@ -262,7 +262,7 @@ else CONFIG_LL_DP_SUPPORT := y endif -ifeq ($(CONFIG_HIF_PCI), y) +ifeq ($(CONFIG_ROME_IF),pci) ifneq ($(CONFIG_WLAN_TX_FLOW_CONTROL_V2), y) ifneq ($(CONFIG_LITHIUM), y) CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY := y