Ver código fonte

qcacmn: Remove redundant data structure for wmi response extraction

Remove redundant data structure at wmi for vdev delete
response extraction, instead use mlme host data structure.

Change-Id: Iedb4280fb47d6567bc4d7b663ecd6af5e769ddfc
CRs-Fixed: 2641197
Naga 5 anos atrás
pai
commit
b805e1fa7b

+ 2 - 4
target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c

@@ -363,8 +363,7 @@ static int target_if_vdev_mgr_delete_response_handler(ol_scn_t scn,
 	struct wlan_objmgr_psoc *psoc;
 	struct wmi_unified *wmi_handle;
 	struct wlan_lmac_if_mlme_rx_ops *rx_ops;
-	struct vdev_delete_response rsp = {0};
-	struct wmi_host_vdev_delete_resp vdev_del_resp;
+	struct vdev_delete_response vdev_del_resp = {0};
 	struct vdev_response_timer *vdev_rsp;
 
 	if (!scn || !data) {
@@ -413,8 +412,7 @@ static int target_if_vdev_mgr_delete_response_handler(ol_scn_t scn,
 		goto err;
 	}
 
-	rsp.vdev_id = vdev_del_resp.vdev_id;
-	status = rx_ops->vdev_mgr_delete_response(psoc, &rsp);
+	status = rx_ops->vdev_mgr_delete_response(psoc, &vdev_del_resp);
 
 err:
 	return qdf_status_to_os_return(status);

+ 0 - 8
wmi/inc/wmi_unified_param.h

@@ -5380,14 +5380,6 @@ typedef enum {
 	WMI_HOST_VDEV_RESTART_RESP_EVENT,
 } WMI_HOST_START_EVENT_PARAM;
 
-/**
- * struct wmi_host_vdev_delete_resp - VDEV delete response
- * @vdev_id: vdev id
- */
-struct wmi_host_vdev_delete_resp {
-	uint32_t vdev_id;
-};
-
 /**
  * struct wmi_host_roam_event - host roam event param
  * @vdev_id: vdev id

+ 3 - 2
wmi/inc/wmi_unified_priv.h

@@ -1479,8 +1479,9 @@ QDF_STATUS
 QDF_STATUS (*extract_vdev_start_resp)(wmi_unified_t wmi_handle, void *evt_buf,
 				      struct vdev_start_response *vdev_rsp);
 
-QDF_STATUS (*extract_vdev_delete_resp)(wmi_unified_t wmi_handle, void *evt_buf,
-	struct wmi_host_vdev_delete_resp *delete_rsp);
+QDF_STATUS (*extract_vdev_delete_resp)(
+				wmi_unified_t wmi_handle, void *evt_buf,
+				struct vdev_delete_response *delete_rsp);
 
 QDF_STATUS (*extract_tbttoffset_update_params)(wmi_unified_t wmi_hdl,
 					void *evt_buf, uint8_t idx,

+ 1 - 1
wmi/inc/wmi_unified_vdev_api.h

@@ -108,7 +108,7 @@ wmi_extract_vdev_stopped_param(struct wmi_unified *wmi_handle, void *evt_buf,
  */
 QDF_STATUS
 wmi_extract_vdev_delete_resp(struct wmi_unified *wmi_handle, void *evt_buf,
-			     struct wmi_host_vdev_delete_resp *vdev_del_resp);
+			     struct vdev_delete_response *vdev_del_resp);
 
 /**
  * wmi_extract_vdev_peer_delete_all_response_event() - extract peer delete all

+ 1 - 1
wmi/src/wmi_unified_vdev_api.c

@@ -83,7 +83,7 @@ wmi_extract_vdev_start_resp(struct wmi_unified *wmi_handle, void *evt_buf,
 
 QDF_STATUS
 wmi_extract_vdev_delete_resp(struct wmi_unified *wmi_handle, void *evt_buf,
-			     struct wmi_host_vdev_delete_resp *delete_rsp)
+			     struct vdev_delete_response *delete_rsp)
 {
 	if (wmi_handle->ops->extract_vdev_delete_resp)
 		return wmi_handle->ops->extract_vdev_delete_resp(wmi_handle,

+ 1 - 1
wmi/src/wmi_unified_vdev_tlv.c

@@ -211,7 +211,7 @@ extract_vdev_start_resp_tlv(struct wmi_unified *wmi_handle, void *evt_buf,
 
 static QDF_STATUS
 extract_vdev_delete_resp_tlv(struct wmi_unified *wmi_handle, void *evt_buf,
-			     struct wmi_host_vdev_delete_resp *delete_rsp)
+			     struct vdev_delete_response *delete_rsp)
 {
 	WMI_VDEV_DELETE_RESP_EVENTID_param_tlvs *param_buf;
 	wmi_vdev_delete_resp_event_fixed_param *ev;