qcacld-3.0: Remove Vdev SM related flags from configs

Vdev SM related flags are no longer used so remove them.

Change-Id: Iafb5d15691644912e563072a9fd6bdccd1b16918
CRs-Fixed: 2457271

Kbuild

@@ -930,14 +930,12 @@ UMAC_MLME_INC := -I$(WLAN_COMMON_INC)/umac/mlme \
 		-I$(WLAN_COMMON_INC)/umac/mlme/vdev_mgr/dispatcher/inc \
 		-I$(WLAN_COMMON_INC)/umac/mlme/pdev_mgr/dispatcher/inc
 
-ifeq ($(CONFIG_CMN_VDEV_MLME_SM), y)
 UMAC_MLME_OBJS := $(WLAN_COMMON_ROOT)/umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.o \
 		$(WLAN_COMMON_ROOT)/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.o \
 		$(WLAN_COMMON_ROOT)/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mlme_api.o \
 		$(WLAN_COMMON_ROOT)/umac/mlme/mlme_objmgr/dispatcher/src/wlan_cmn_mlme_main.o \
 		$(WLAN_COMMON_ROOT)/umac/mlme/mlme_objmgr/dispatcher/src/wlan_pdev_mlme_main.o \
 		$(WLAN_COMMON_ROOT)/umac/mlme/pdev_mgr/dispatcher/src/wlan_pdev_mlme_api.o
-endif
 
 ######## MLME ##############
 MLME_DIR := components/mlme
@@ -948,9 +946,7 @@ MLME_OBJS :=	$(MLME_DIR)/core/src/wlan_mlme_main.o \
 		$(MLME_DIR)/dispatcher/src/wlan_mlme_api.o \
 		$(MLME_DIR)/dispatcher/src/wlan_mlme_ucfg_api.o
 
-ifeq ($(CONFIG_CMN_VDEV_MLME_SM), y)
 MLME_OBJS += $(MLME_DIR)/core/src/wlan_mlme_vdev_mgr_interface.o
-endif
 
 ########## ACTION OUI ##########
 
@@ -2475,13 +2471,6 @@ cppflags-$(CONFIG_VERBOSE_DEBUG) += -DENABLE_VERBOSE_DEBUG
 cppflags-$(CONFIG_RX_DESC_DEBUG_CHECK) += -DRX_DESC_DEBUG_CHECK
 #Enable STATE MACHINE HISTORY
 cppflags-$(CONFIG_SM_ENG_HIST) += -DSM_ENG_HIST_ENABLE
-#Enable VDEV STATE MACHINE
-ifeq ($(CONFIG_CMN_VDEV_MLME_SM), y)
-cppflags-y += -DCMN_VDEV_MLME_SM_ENABLE \
-              -DCMN_VDEV_MLME_CMPT_ENABLE \
-              -DCONFIG_VDEV_SM
-cppflags-$(CONFIG_SM_ENG_HIST) += -DSM_ENG_HIST_ENABLE
-endif
 
 # Vendor Commands
 cppflags-$(CONFIG_FEATURE_RSSI_MONITOR) += -DFEATURE_RSSI_MONITOR

configs/default_defconfig

@@ -794,12 +794,8 @@ CONFIG_PLD_PCIE_INIT_FLAG := y
 endif
 endif
 
-#Enable VDEV STATE MACHINE
-CONFIG_CMN_VDEV_MLME_SM := y
-ifeq ($(CONFIG_CMN_VDEV_MLME_SM), y)
 #Enable STATE MACHINE HISTORY
 CONFIG_SM_ENG_HIST := n
-endif
 
 ifeq (y,$(findstring y,$(CONFIG_ARCH_MSM) $(CONFIG_ARCH_QCOM)))
 CONFIG_WLAN_FEATURE_DP_BUS_BANDWIDTH := y

configs/genoa.common

@@ -204,12 +204,8 @@ CONFIG_WMI_BCN_OFFLOAD := y
 #Flag to enable Supported Operating class
 CONFIG_HOST_OPCLASS := y
 
-#Enable VDEV STATE MACHINE
-CONFIG_CMN_VDEV_MLME_SM := y
-ifeq ($(CONFIG_CMN_VDEV_MLME_SM), y)
 #Enable STATE MACHINE HISTORY
 CONFIG_SM_ENG_HIST := n
-endif
 
 ifeq (y,$(findstring y,$(CONFIG_ARCH_MSM) $(CONFIG_ARCH_QCOM)))
 CONFIG_WLAN_FEATURE_DP_BUS_BANDWIDTH := y

configs/qca6174_defconfig

@@ -684,12 +684,9 @@ CONFIG_PLD_PCIE_INIT_FLAG := y
 endif
 endif
 
-#Enable VDEV STATE MACHINE
-CONFIG_CMN_VDEV_MLME_SM := y
-ifeq ($(CONFIG_CMN_VDEV_MLME_SM), y)
 #Enable STATE MACHINE HISTORY
 CONFIG_SM_ENG_HIST := n
-endif
+
 #Enable Beacon Reception Stats
 CONFIG_FEATURE_BECN_STATS := y
 

configs/qca6390_defconfig

@@ -708,12 +708,9 @@ CONFIG_PLD_PCIE_INIT_FLAG := y
 endif
 endif
 
-#Enable VDEV STATE MACHINE
-CONFIG_CMN_VDEV_MLME_SM := y
-ifeq ($(CONFIG_CMN_VDEV_MLME_SM), y)
 #Enable STATE MACHINE HISTORY
 CONFIG_SM_ENG_HIST := n
-endif
+
 #Enable Beacon Reception Stats
 CONFIG_FEATURE_BECN_STATS := y