From c6e9bd033c14f787a4fac531547b66779d3a5b17 Mon Sep 17 00:00:00 2001 From: Naga Date: Fri, 13 Mar 2020 17:31:54 +0530 Subject: [PATCH] qcacmn: Remove redundant data structure for wmi response extraction Remove redundant data structure at wmi for vdev delete all peer response extraction, instead use mlme host data structure. Change-Id: Ice91f55e0bf8a23ea1a639a74f6a8ac3b2779a7b CRs-Fixed: 2641261 --- .../mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c | 10 ++++------ wmi/inc/wmi_unified_param.h | 14 -------------- wmi/inc/wmi_unified_priv.h | 5 ++--- wmi/inc/wmi_unified_vdev_api.h | 4 ++-- wmi/src/wmi_unified_vdev_api.c | 2 +- wmi/src/wmi_unified_vdev_tlv.c | 2 +- 6 files changed, 10 insertions(+), 27 deletions(-) diff --git a/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c b/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c index 9fa4ad56219e..33f9df095c96 100644 --- a/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c +++ b/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c @@ -434,9 +434,7 @@ static int target_if_vdev_mgr_peer_delete_all_response_handler( struct wlan_objmgr_psoc *psoc; struct wmi_unified *wmi_handle; struct wlan_lmac_if_mlme_rx_ops *rx_ops; - struct peer_delete_all_response rsp = {0}; - struct wmi_host_vdev_peer_delete_all_response_event - vdev_peer_del_all_resp; + struct peer_delete_all_response vdev_peer_del_all_resp = {0}; struct vdev_response_timer *vdev_rsp; if (!scn || !data) { @@ -490,9 +488,9 @@ static int target_if_vdev_mgr_peer_delete_all_response_handler( goto err; } - rsp.vdev_id = vdev_peer_del_all_resp.vdev_id; - rsp.status = vdev_peer_del_all_resp.status; - status = rx_ops->vdev_mgr_peer_delete_all_response(psoc, &rsp); + status = rx_ops->vdev_mgr_peer_delete_all_response( + psoc, + &vdev_peer_del_all_resp); err: return qdf_status_to_os_return(status); diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index b70ebc65b2f7..e5368450f990 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -6933,20 +6933,6 @@ struct wmi_host_peer_delete_response_event { struct qdf_mac_addr mac_address; }; -/** - * struct wmi_host_vdev_peer_delete_all_response_event - - * VDEV peer delete all response - * @vdev_id: vdev id - * @status: status of request - * 0 - OK; command successful - * 1 - EINVAL; Requested invalid vdev_id - * 2 - EFAILED; Delete all peer failed - */ -struct wmi_host_vdev_peer_delete_all_response_event { - uint32_t vdev_id; - uint32_t status; -}; - /** * @struct wmi_host_dcs_interference_param * @interference_type: Type of DCS Interference diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index 7e8137e22aad..bf6d35e92ae8 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -1841,13 +1841,12 @@ QDF_STATUS (*extract_peer_delete_response_event)( QDF_STATUS (*extract_vdev_peer_delete_all_resp)( wmi_unified_t wmi_handle, void *evt_buf, - struct wmi_host_vdev_peer_delete_all_response_event - *peer_delete_all_rsp); + struct peer_delete_all_response *peer_delete_all_rsp); QDF_STATUS (*extract_vdev_peer_delete_all_response_event)( wmi_unified_t wmi_handle, void *evt_buf, - struct wmi_host_vdev_peer_delete_all_response_event *param); + struct peer_delete_all_response *param); bool (*is_management_record)(uint32_t cmd_id); bool (*is_diag_event)(uint32_t event_id); diff --git a/wmi/inc/wmi_unified_vdev_api.h b/wmi/inc/wmi_unified_vdev_api.h index 6544c42e68e0..12c416a31cdd 100644 --- a/wmi/inc/wmi_unified_vdev_api.h +++ b/wmi/inc/wmi_unified_vdev_api.h @@ -115,14 +115,14 @@ wmi_extract_vdev_delete_resp(struct wmi_unified *wmi_handle, void *evt_buf, * response * @wmi_handle: wmi handle * @param evt_buf: pointer to event buffer - * @param delete_rsp: Pointer to hold peer delete al response + * @param delete_rsp: Pointer to hold peer delete all response * * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_extract_vdev_peer_delete_all_response_event( struct wmi_unified *wmi_handle, void *evt_buf, - struct wmi_host_vdev_peer_delete_all_response_event *delete_rsp); + struct peer_delete_all_response *delete_rsp); /** * wmi_extract_ext_tbttoffset_num_vdevs() - extract ext tbtt offset num vdev diff --git a/wmi/src/wmi_unified_vdev_api.c b/wmi/src/wmi_unified_vdev_api.c index e11635125594..2b44e3eb2ea7 100644 --- a/wmi/src/wmi_unified_vdev_api.c +++ b/wmi/src/wmi_unified_vdev_api.c @@ -96,7 +96,7 @@ wmi_extract_vdev_delete_resp(struct wmi_unified *wmi_handle, void *evt_buf, QDF_STATUS wmi_extract_vdev_peer_delete_all_response_event( struct wmi_unified *wmi_handle, void *evt_buf, - struct wmi_host_vdev_peer_delete_all_response_event *delete_rsp) + struct peer_delete_all_response *delete_rsp) { if (wmi_handle->ops->extract_vdev_peer_delete_all_response_event) return diff --git a/wmi/src/wmi_unified_vdev_tlv.c b/wmi/src/wmi_unified_vdev_tlv.c index 15fd13b85db1..9b2a22acfb57 100644 --- a/wmi/src/wmi_unified_vdev_tlv.c +++ b/wmi/src/wmi_unified_vdev_tlv.c @@ -237,7 +237,7 @@ extract_vdev_delete_resp_tlv(struct wmi_unified *wmi_handle, void *evt_buf, static QDF_STATUS extract_vdev_peer_delete_all_response_event_tlv( wmi_unified_t wmi_hdl, void *evt_buf, - struct wmi_host_vdev_peer_delete_all_response_event *param) + struct peer_delete_all_response *param) { WMI_VDEV_DELETE_ALL_PEER_RESP_EVENTID_param_tlvs *param_buf; wmi_vdev_delete_all_peer_resp_event_fixed_param *ev;