Merge "qca-wifi: Add support for FW cap for chan_width_switch_cmd"
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 cc14758..42da66d 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 @@
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 4379c9d..a1c7049 100644
--- a/wmi/src/wmi_unified_ap_tlv.c
+++ b/wmi/src/wmi_unified_ap_tlv.c
@@ -2557,18 +2557,12 @@
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 ad56192..75845fd 100644
--- a/wmi/src/wmi_unified_non_tlv.c
+++ b/wmi/src/wmi_unified_non_tlv.c
@@ -10129,8 +10129,10 @@
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;
}