qcacld-3.0: Replace legacy string in vdevmgr with ext
Replace legacy string in vdevmgr with ext string.
Also adds new compile CMN_VDEV_MLME_CMPT_ENABLE macro
for VDEV MLME component.
Change-Id: I40ce0c2ee4d653d2f4ce68093e8ad1b2c78bece8
CRs-Fixed: 2361525
diff --git a/Kbuild b/Kbuild
index d1a6154..6404597 100644
--- a/Kbuild
+++ b/Kbuild
@@ -893,7 +893,7 @@
$(MLME_DIR)/dispatcher/src/wlan_mlme_api.o \
$(MLME_DIR)/dispatcher/src/wlan_mlme_ucfg_api.o
-ifeq ($(CONFIG_VDEV_SM), y)
+ifeq ($(CONFIG_CMN_VDEV_MLME_SM), y)
MLME_OBJS += $(MLME_DIR)/core/src/wlan_mlme_vdev_mgr_interface.o
endif
@@ -2357,8 +2357,12 @@
#Enable STATE MACHINE HISTORY
cppflags-$(CONFIG_SM_ENG_HIST) += -DSM_ENG_HIST_ENABLE
#Enable VDEV STATE MACHINE
-cppflags-$(CONFIG_CMN_VDEV_MLME_SM) += -DCMN_VDEV_MLME_SM_ENABLE
-cppflags-$(CONFIG_VDEV_SM) += -DCONFIG_VDEV_SM
+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