From cf33f9653bac0fd53557d6892238a81097f83eb2 Mon Sep 17 00:00:00 2001 From: Ajit Pal Singh Date: Thu, 19 Jul 2018 17:50:47 +0530 Subject: [PATCH] qcacld-3.0: sdio: Control HL flow control through defconfigs Do not enable HL Flow Control config flags in Kbuild. Instead depend on defconfig settings to enable/disable HL Flow control flags. Change-Id: I734c4cd26d056ce28ce064e8d353075ad22e39ee CRs-Fixed: 2284686 --- Kbuild | 6 +++--- configs/default_defconfig | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Kbuild b/Kbuild index 5cc09cf540ff..170ac855da0e 100644 --- a/Kbuild +++ b/Kbuild @@ -1818,12 +1818,9 @@ cppflags-y += -DCONFIG_HL_SUPPORT \ -DHIF_SDIO \ -DCONFIG_DISABLE_CDC_MAX_PERF_WAR=0 \ -DCONFIG_ATH_PROCFS_DIAG_SUPPORT \ - -DFEATURE_HL_GROUP_CREDIT_FLOW_CONTROL \ -DHIF_MBOX_SLEEP_WAR \ -DDEBUG_HL_LOGGING \ -DQCA_BAD_PEER_TX_FLOW_CL \ - -DCONFIG_TX_DESC_HI_PRIO_RESERVE \ - -DCONFIG_PER_VDEV_TX_DESC_POOL \ -DCONFIG_SDIO \ -DFEATURE_WLAN_FORCE_SAP_SCC @@ -1858,6 +1855,9 @@ cppflags-$(CONFIG_FEATURE_HL_GROUP_CREDIT_FLOW_CONTROL) += -DFEATURE_HL_GROUP_CR cppflags-$(CONFIG_FEATURE_HL_DBS_GROUP_CREDIT_SHARING) += -DFEATURE_HL_DBS_GROUP_CREDIT_SHARING cppflags-$(CONFIG_CREDIT_REP_THROUGH_CREDIT_UPDATE) += -DCONFIG_CREDIT_REP_THROUGH_CREDIT_UPDATE +cppflags-$(CONFIG_TX_DESC_HI_PRIO_RESERVE) += -DCONFIG_TX_DESC_HI_PRIO_RESERVE +cppflags-$(CONFIG_PER_VDEV_TX_DESC_POOL) += -DCONFIG_PER_VDEV_TX_DESC_POOL + #Enable FW logs through ini cppflags-y += -DCONFIG_FW_LOGS_BASED_ON_INI diff --git a/configs/default_defconfig b/configs/default_defconfig index 837082ce047b..fc7119cf3735 100644 --- a/configs/default_defconfig +++ b/configs/default_defconfig @@ -382,6 +382,9 @@ endif #Enable SDIO specific APIS ifeq ($(CONFIG_ROME_IF),sdio) CONFIG_HIF_SDIO := y + CONFIG_TX_DESC_HI_PRIO_RESERVE := y + CONFIG_PER_VDEV_TX_DESC_POOL := y + CONFIG_FEATURE_HL_GROUP_CREDIT_FLOW_CONTROL := y endif ifeq ($(CONFIG_ROME_IF),snoc)