From 91daea9427f393e140e7e8e4d6ab5d46f78dd378 Mon Sep 17 00:00:00 2001
From: Nirav Shah <nnshah@codeaurora.org>
Date: Wed, 6 Jun 2018 17:01:52 +0530
Subject: [PATCH] qcacld-3.0: Remove duplicate config for ATH_11AC_TXCOMPACT

Remove duplicate config for ATH_11AC_TXCOMPACT feature.

Change-Id: I1a264c61d69f28feeae1bc2db496468456ae60f2
CRs-Fixed: 2255912
---
 Kbuild                             | 1 -
 configs/default_defconfig          | 2 +-
 configs/genoa.snoc.debug_defconfig | 2 +-
 configs/genoa.snoc.perf_defconfig  | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Kbuild b/Kbuild
index 903e9a2c4653..358fe87db19d 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1843,7 +1843,6 @@ cppflags-$(CONFIG_WLAN_SYNC_TSF) += -DWLAN_FEATURE_TSF
 cppflags-$(CONFIG_WLAN_SYNC_TSF_PLUS) += -DWLAN_FEATURE_TSF_PLUS
 
 cppflags-$(CONFIG_ATH_PROCFS_DIAG_SUPPORT) += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
-cppflags-$(CONFIG_11AC_TXCOMPACT) += -DATH_11AC_TXCOMPACT
 
 cppflags-$(CONFIG_HELIUMPLUS) += -DHELIUMPLUS
 cppflags-$(CONFIG_RX_OL) += -DRECEIVE_OFFLOAD
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 6c30aeb831c2..d27f746d58ed 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -227,7 +227,7 @@ CONFIG_ADRASTEA_RRI_ON_DDR := y
 # Enable athdiag procfs debug support for adrastea
 CONFIG_ATH_PROCFS_DIAG_SUPPORT := y
 # Enable 11AC TX compact feature for adrastea
-CONFIG_11AC_TXCOMPACT := y
+CONFIG_ATH_11AC_TXCOMPACT := y
 ifeq ($(CONFIG_QMI_SUPPORT), y)
 CONFIG_ADRASTEA_SHADOW_REGISTERS := y
 endif
diff --git a/configs/genoa.snoc.debug_defconfig b/configs/genoa.snoc.debug_defconfig
index 57b368cba924..694c8d999cd3 100644
--- a/configs/genoa.snoc.debug_defconfig
+++ b/configs/genoa.snoc.debug_defconfig
@@ -54,7 +54,7 @@ CONFIG_WLAN_FASTPATH := y
 CONFIG_FEATURE_TSO := y
 CONFIG_WLAN_NAPI := y
 CONFIG_WLAN_TX_FLOW_CONTROL_V2 := y
-CONFIG_11AC_TXCOMPACT := y
+CONFIG_ATH_11AC_TXCOMPACT := y
 CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
 CONFIG_CHECKSUM_OFFLOAD := y
 CONFIG_QCA_SUPPORT_TX_THROTTLE := y
diff --git a/configs/genoa.snoc.perf_defconfig b/configs/genoa.snoc.perf_defconfig
index 43dc19462805..9a3b01fe183b 100644
--- a/configs/genoa.snoc.perf_defconfig
+++ b/configs/genoa.snoc.perf_defconfig
@@ -55,7 +55,7 @@ CONFIG_WLAN_FASTPATH := y
 CONFIG_FEATURE_TSO := y
 CONFIG_WLAN_NAPI := y
 CONFIG_WLAN_TX_FLOW_CONTROL_V2 := y
-CONFIG_11AC_TXCOMPACT := y
+CONFIG_ATH_11AC_TXCOMPACT := y
 CONFIG_TX_CREDIT_RECLAIM_SUPPORT := n
 CONFIG_CHECKSUM_OFFLOAD := y
 CONFIG_QCA_SUPPORT_TX_THROTTLE := y