diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index 611f2f8583..e1a6921247 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -64,8 +64,6 @@
 #define WMA_MAC_TO_PDEV_MAP(x) ((x) + (1))
 #define WMA_PDEV_TO_MAC_MAP(x) ((x) - (1))
 
-#define WMA_MAX_SUPPORTED_BSS     SIR_MAX_SUPPORTED_BSS
-
 #define WMA_MAX_MGMT_MPDU_LEN 2000
 
 #define MAX_PRINT_FAILURE_CNT 50
@@ -656,12 +654,9 @@ struct wma_version_info {
  * @wow_enable_cmd_sent: is wow enable command sent to fw
  * @deauth_enable: is deauth wakeup enable/disable
  * @disassoc_enable: is disassoc wakeup enable/disable
- * @gtk_pdev_enable: is GTK based wakeup enable/disable
  * @gtk_err_enable: is GTK error wakeup enable/disable
- * @lphb_cache: lphb cache
  *
- * This structure stores wow patterns and
- * wow related parameters in host.
+ * This structure stores wow patterns and wow related parameters in host.
  */
 struct wma_wow {
 	bool magic_ptrn_enable;
@@ -669,7 +664,7 @@ struct wma_wow {
 	bool wow_enable_cmd_sent;
 	bool deauth_enable;
 	bool disassoc_enable;
-	bool gtk_err_enable[WMA_MAX_SUPPORTED_BSS];
+	bool gtk_err_enable[WLAN_MAX_VDEVS];
 };
 
 #ifdef WLAN_FEATURE_11W
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index b1daecb80d..9a4b0f9751 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -3313,7 +3313,7 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
 		WMA_LOGE("%s: Failed to get self_gen_frm_pwr", __func__);
 	wma_handle->self_gen_frm_pwr = self_gen_frm_pwr;
 
-	cds_cfg->max_bssid = WMA_MAX_SUPPORTED_BSS;
+	cds_cfg->max_bssid = WLAN_MAX_VDEVS;
 
 	wma_handle->max_station = cds_cfg->max_station;
 	wma_handle->max_bssid = cds_cfg->max_bssid;