Merge "qcacld-3.0: Remove unused macros from Kbuild" into wlan-cld3.driver.lnx.1.1-dev

Kbuild

@@ -1029,11 +1029,9 @@ EXTRA_CFLAGS += $(INCS)
 
 CDEFINES :=	-DANI_LITTLE_BYTE_ENDIAN \
 		-DANI_LITTLE_BIT_ENDIAN \
-		-DQC_WLAN_CHIPSET_QCA_CLD \
 		-DDOT11F_LITTLE_ENDIAN_HOST \
 		-DANI_COMPILER_TYPE_GCC \
 		-DANI_OS_TYPE_ANDROID=6 \
-		-DWLAN_PERF \
 		-DPTT_SOCK_SVC_ENABLE \
 		-Wall\
 		-Werror\
@@ -1055,8 +1053,6 @@ CDEFINES :=	-DANI_LITTLE_BYTE_ENDIAN \
 		-DFEATURE_WLAN_RA_FILTERING\
 		-DWLAN_NL80211_TESTMODE \
 		-DFEATURE_WLAN_LPHB \
-		-DFEATURE_WLAN_PAL_TIMER_DISABLE \
-		-DFEATURE_WLAN_PAL_MEM_DISABLE \
 		-DQCA_SUPPORT_TX_THROTTLE \
 		-DWMI_INTERFACE_EVENT_LOGGING \
 		-DATH_SUPPORT_WAPI \
@@ -1173,10 +1169,6 @@ ifeq ($(CONFIG_PRIMA_WLAN_OKC),y)
 CDEFINES += -DFEATURE_WLAN_OKC
 endif
 
-ifeq ($(CONFIG_PRIMA_WLAN_11AC_HIGH_TP),y)
-CDEFINES += -DWLAN_FEATURE_11AC_HIGH_TP
-endif
-
 ifeq ($(BUILD_DIAG_VERSION),1)
 CDEFINES += -DFEATURE_WLAN_DIAG_SUPPORT
 CDEFINES += -DFEATURE_WLAN_DIAG_SUPPORT_CSR
@@ -1193,9 +1185,6 @@ CDEFINES += -DCONFIG_ATH_PCIE_MAX_PERF=0 -DCONFIG_ATH_PCIE_AWAKE_WHILE_DRIVER_LO
 CDEFINES += -DQCA_TX_HTT2_SUPPORT
 endif
 
-# enable the MAC Address auto-generation feature
-CDEFINES += -DWLAN_AUTOGEN_MACADDR_FEATURE
-
 ifeq ($(CONFIG_WLAN_FEATURE_11W),y)
 CDEFINES += -DWLAN_FEATURE_11W
 endif
@@ -1404,9 +1393,6 @@ CDEFINES += -DFEATURE_WLAN_STA_AP_MODE_DFS_DISABLE
 #Enable OBSS feature
 CDEFINES += -DQCA_HT_2040_COEX
 
-#Disable HT40 in 2.4GHZ STA mode
-CDEFINES += -DQCA_HT_20_24G_STA_ONLY
-
 else #CONFIG_MOBILE_ROUTER
 
 #Open P2P device interface only for non-Mobile router use cases
@@ -1460,17 +1446,6 @@ ifeq ($(CONFIG_ATH_PCIE_ACCESS_DEBUG), 1)
 CDEFINES += -DCONFIG_ATH_PCIE_ACCESS_DEBUG
 endif
 
-# Some kernel include files are being moved.  Check to see if
-# the old version of the files are present
-
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/mach-msm/include/mach/msm_smd.h),)
-CDEFINES += -DEXISTS_MSM_SMD
-endif
-
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/mach-msm/include/mach/msm_smsm.h),)
-CDEFINES += -DEXISTS_MSM_SMSM
-endif
-
 # Enable feature support fo Linux version QCMBR
 ifeq ($(CONFIG_LINUX_QCMBR),y)
 CDEFINES += -DLINUX_QCMBR