From 37f84d48a47b772ee0724d88b7343acef96ac18c Mon Sep 17 00:00:00 2001 From: Santosh Anbu Date: Wed, 20 May 2020 14:54:01 +0530 Subject: [PATCH] qca-wifi: 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: I2c14a43982eb6e7cb5965253633ac00b357314e1 --- umac/mlme/vdev_mgr/core/src/vdev_mlme_sm_actions.c | 5 +++-- wmi/src/wmi_unified_ap_tlv.c | 14 ++++---------- wmi/src/wmi_unified_non_tlv.c | 6 ++++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm_actions.c b/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm_actions.c index cc14758871..42da66d676 100644 --- a/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm_actions.c +++ b/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm_actions.c @@ -306,8 +306,9 @@ static void mlme_multivdev_restart(struct pdev_mlme_obj *pdev_mlme) else mlme_vdev_ops_multivdev_restart_fw_cmd_send(pdev); - if (pdev_mlme->start_send_vdev_arr[0] || - pdev_mlme->start_send_vdev_arr[1]) { + if (wlan_util_map_is_any_index_set( + pdev_mlme->start_send_vdev_arr, + sizeof(pdev_mlme->start_send_vdev_arr))) { wlan_objmgr_pdev_iterate_obj_list (pdev, WLAN_VDEV_OP, wlan_vdev_start_fw_send, diff --git a/wmi/src/wmi_unified_ap_tlv.c b/wmi/src/wmi_unified_ap_tlv.c index 683408cc16..5e128c0aa8 100644 --- a/wmi/src/wmi_unified_ap_tlv.c +++ b/wmi/src/wmi_unified_ap_tlv.c @@ -2543,18 +2543,12 @@ static QDF_STATUS extract_multi_vdev_restart_resp_event_tlv( if (!param_buf->num_vdev_ids_bitmap) return QDF_STATUS_E_FAILURE; - if ((param_buf->num_vdev_ids_bitmap * sizeof(uint32_t)) > - sizeof(param->vdev_id_bmap)) { - WMI_LOGE("vdevId bitmap overflow size:%d", - param_buf->num_vdev_ids_bitmap); - return QDF_STATUS_E_FAILURE; - } - qdf_mem_copy(param->vdev_id_bmap, param_buf->vdev_ids_bitmap, - param_buf->num_vdev_ids_bitmap * sizeof(uint32_t)); + sizeof(param->vdev_id_bmap)); - WMI_LOGD("vdev_id_bmap :0x%x%x", param->vdev_id_bmap[1], - param->vdev_id_bmap[0]); + WMI_LOGD("vdev_id_bmap is as follows"); + qdf_trace_hex_dump(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, + param->vdev_id_bmap, sizeof(param->vdev_id_bmap)); return QDF_STATUS_SUCCESS; } diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c index ad56192dde..75845fd911 100644 --- a/wmi/src/wmi_unified_non_tlv.c +++ b/wmi/src/wmi_unified_non_tlv.c @@ -10129,8 +10129,10 @@ static QDF_STATUS extract_multi_vdev_restart_resp_event_non_tlv( qdf_mem_copy(param->vdev_id_bmap, &ev->requestor_id, sizeof(uint32_t)); - WMI_LOGD("vdev_id_bmap :0x%x%x", param->vdev_id_bmap[1], - param->vdev_id_bmap[0]); + WMI_LOGD("vdev_id_bmap is as follows"); + qdf_trace_hex_dump(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, + param->vdev_id_bmap, sizeof(param->vdev_id_bmap)); + return QDF_STATUS_SUCCESS; }