From ef8a6e1b47a4c0608bfb2a34e5ecf74aaa3ebd33 Mon Sep 17 00:00:00 2001
From: Santosh Anbu <sanbu@codeaurora.org>
Date: Wed, 20 May 2020 14:52:48 +0530
Subject: [PATCH] qcacmn: Define restart bitmap using qdf_bitmap

Add change to define restart bitmap using the generalized bitmap
declaration. Also use generalized function to check if any of the
bits are set in the bitmap.

Change-Id: I06859fc089f121559231a7e13bcab63322e5ef9b
CRs-Fixed: 2690914
---
 umac/mlme/include/wlan_pdev_mlme.h                           | 2 +-
 .../vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_rx_defs.h   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/umac/mlme/include/wlan_pdev_mlme.h b/umac/mlme/include/wlan_pdev_mlme.h
index 429646901fe3..67341992d51d 100644
--- a/umac/mlme/include/wlan_pdev_mlme.h
+++ b/umac/mlme/include/wlan_pdev_mlme.h
@@ -53,7 +53,7 @@ struct pdev_mlme_obj {
 	qdf_timer_t restart_req_timer;
 	qdf_bitmap(restart_pend_vdev_bmap, WLAN_UMAC_PSOC_MAX_VDEVS);
 	qdf_bitmap(restart_send_vdev_bmap, WLAN_UMAC_PSOC_MAX_VDEVS);
-	unsigned long start_send_vdev_arr[2];
+	qdf_bitmap(start_send_vdev_arr, WLAN_UMAC_PSOC_MAX_VDEVS);
 	struct pdev_restart_attr pdev_restart;
 	qdf_atomic_t multivdev_restart_wait_cnt;
 };
diff --git a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_rx_defs.h b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_rx_defs.h
index fe616bdf5582..093607b4eb58 100644
--- a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_rx_defs.h
+++ b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_rx_defs.h
@@ -28,6 +28,8 @@
 
 #include <qdf_timer.h>
 #include <qdf_atomic.h>
+#include <qdf_util.h>
+#include <wlan_cmn.h>
 #ifdef FEATURE_RUNTIME_PM
 #include <wlan_pmo_common_public_struct.h>
 #endif
@@ -152,7 +154,6 @@ struct peer_delete_all_response {
 	uint8_t status;
 };
 
-#define VDEV_ID_BMAP_SIZE 3
 /**
  * struct multi_vdev_restart_resp - multi-vdev restart response structure
  * @pdev_id: pdev id
@@ -162,7 +163,7 @@ struct peer_delete_all_response {
 struct multi_vdev_restart_resp {
 	uint8_t pdev_id;
 	uint8_t status;
-	unsigned long vdev_id_bmap[VDEV_ID_BMAP_SIZE];
+	qdf_bitmap(vdev_id_bmap, WLAN_UMAC_PSOC_MAX_VDEVS);
 };
 
 #endif /* __WLAN_VDEV_MGR_TGT_IF_RX_DEFS_H__ */