فهرست منبع

qcacmn: Remove redundant data structure for wmi response extraction

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

Change-Id: Ie0d3e6fa0acb1fea8bc0f50095491dbe803f6810
CRs-Fixed: 2641085
Naga 5 سال پیش
والد
کامیت
c0cb57c6fc

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

@@ -237,8 +237,7 @@ static int target_if_vdev_mgr_start_response_handler(ol_scn_t scn,
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_objmgr_psoc *psoc;
 	struct wmi_unified *wmi_handle;
 	struct wmi_unified *wmi_handle;
 	struct wlan_lmac_if_mlme_rx_ops *rx_ops;
 	struct wlan_lmac_if_mlme_rx_ops *rx_ops;
-	struct vdev_start_response rsp = {0};
-	wmi_host_vdev_start_resp vdev_start_resp;
+	struct vdev_start_response vdev_start_resp = {0};
 	uint8_t vdev_id;
 	uint8_t vdev_id;
 	struct vdev_response_timer *vdev_rsp;
 	struct vdev_response_timer *vdev_rsp;
 
 
@@ -292,17 +291,7 @@ static int target_if_vdev_mgr_start_response_handler(ol_scn_t scn,
 		goto err;
 		goto err;
 	}
 	}
 
 
-	rsp.vdev_id = vdev_start_resp.vdev_id;
-	rsp.requestor_id = vdev_start_resp.requestor_id;
-	rsp.status = vdev_start_resp.status;
-	rsp.resp_type = vdev_start_resp.resp_type;
-	rsp.chain_mask = vdev_start_resp.chain_mask;
-	rsp.smps_mode = vdev_start_resp.smps_mode;
-	rsp.mac_id = vdev_start_resp.mac_id;
-	rsp.cfgd_tx_streams = vdev_start_resp.cfgd_tx_streams;
-	rsp.cfgd_rx_streams = vdev_start_resp.cfgd_rx_streams;
-
-	status = rx_ops->vdev_mgr_start_response(psoc, &rsp);
+	status = rx_ops->vdev_mgr_start_response(psoc, &vdev_start_resp);
 
 
 err:
 err:
 	return qdf_status_to_os_return(status);
 	return qdf_status_to_os_return(status);

+ 0 - 25
wmi/inc/wmi_unified_param.h

@@ -5380,31 +5380,6 @@ typedef enum {
 	WMI_HOST_VDEV_RESTART_RESP_EVENT,
 	WMI_HOST_VDEV_RESTART_RESP_EVENT,
 } WMI_HOST_START_EVENT_PARAM;
 } WMI_HOST_START_EVENT_PARAM;
 
 
-/**
- * struct wmi_host_vdev_start_resp - VDEV start response
- * @vdev_id: vdev id
- * @requestor_id: requestor id that requested the VDEV start request
- * @resp_type: Respose of Event type START/RESTART
- * @status: status of the response
- * @chain_mask: Vdev chain mask
- * @smps_mode: Vdev mimo power save mode
- * @mac_id: mac_id field contains the MAC identifier that the
- *          VDEV is bound to. The valid range is 0 to (num_macs-1).
- * @cfgd_tx_streams: Configured Transmit Streams
- * @cfgd_rx_streams: Configured Receive Streams
- */
-typedef struct {
-	uint32_t vdev_id;
-	uint32_t requestor_id;
-	WMI_HOST_START_EVENT_PARAM resp_type;
-	uint32_t status;
-	uint32_t chain_mask;
-	uint32_t smps_mode;
-	uint32_t mac_id;
-	uint32_t cfgd_tx_streams;
-	uint32_t cfgd_rx_streams;
-} wmi_host_vdev_start_resp;
-
 /**
 /**
  * struct wmi_host_vdev_delete_resp - VDEV delete response
  * struct wmi_host_vdev_delete_resp - VDEV delete response
  * @vdev_id: vdev id
  * @vdev_id: vdev id

+ 1 - 1
wmi/inc/wmi_unified_priv.h

@@ -1477,7 +1477,7 @@ QDF_STATUS
 #endif
 #endif
 
 
 QDF_STATUS (*extract_vdev_start_resp)(wmi_unified_t wmi_handle, void *evt_buf,
 QDF_STATUS (*extract_vdev_start_resp)(wmi_unified_t wmi_handle, void *evt_buf,
-	wmi_host_vdev_start_resp *vdev_rsp);
+				      struct vdev_start_response *vdev_rsp);
 
 
 QDF_STATUS (*extract_vdev_delete_resp)(wmi_unified_t wmi_handle, void *evt_buf,
 QDF_STATUS (*extract_vdev_delete_resp)(wmi_unified_t wmi_handle, void *evt_buf,
 	struct wmi_host_vdev_delete_resp *delete_rsp);
 	struct wmi_host_vdev_delete_resp *delete_rsp);

+ 1 - 1
wmi/inc/wmi_unified_vdev_api.h

@@ -84,7 +84,7 @@ QDF_STATUS wmi_unified_beacon_send_cmd(struct wmi_unified *wmi_handle,
  */
  */
 QDF_STATUS
 QDF_STATUS
 wmi_extract_vdev_start_resp(struct wmi_unified *wmi_handle, void *evt_buf,
 wmi_extract_vdev_start_resp(struct wmi_unified *wmi_handle, void *evt_buf,
-			    wmi_host_vdev_start_resp *vdev_start_resp);
+			    struct vdev_start_response *vdev_rsp);
 
 
 /**
 /**
  * wmi_extract_vdev_stopped_param() - extract vdev stop param from event
  * wmi_extract_vdev_stopped_param() - extract vdev stop param from event

+ 1 - 1
wmi/src/wmi_unified_vdev_api.c

@@ -71,7 +71,7 @@ QDF_STATUS wmi_unified_beacon_send_cmd(struct wmi_unified *wmi_handle,
 
 
 QDF_STATUS
 QDF_STATUS
 wmi_extract_vdev_start_resp(struct wmi_unified *wmi_handle, void *evt_buf,
 wmi_extract_vdev_start_resp(struct wmi_unified *wmi_handle, void *evt_buf,
-			    wmi_host_vdev_start_resp *vdev_rsp)
+			    struct vdev_start_response *vdev_rsp)
 {
 {
 	if (wmi_handle->ops->extract_vdev_start_resp)
 	if (wmi_handle->ops->extract_vdev_start_resp)
 		return wmi_handle->ops->extract_vdev_start_resp(wmi_handle,
 		return wmi_handle->ops->extract_vdev_start_resp(wmi_handle,

+ 1 - 1
wmi/src/wmi_unified_vdev_tlv.c

@@ -167,7 +167,7 @@ send_vdev_set_neighbour_rx_cmd_tlv(struct wmi_unified *wmi_handle,
 
 
 static QDF_STATUS
 static QDF_STATUS
 extract_vdev_start_resp_tlv(struct wmi_unified *wmi_handle, void *evt_buf,
 extract_vdev_start_resp_tlv(struct wmi_unified *wmi_handle, void *evt_buf,
-			    wmi_host_vdev_start_resp *vdev_rsp)
+			    struct vdev_start_response *vdev_rsp)
 {
 {
 	WMI_VDEV_START_RESP_EVENTID_param_tlvs *param_buf;
 	WMI_VDEV_START_RESP_EVENTID_param_tlvs *param_buf;
 	wmi_vdev_start_response_event_fixed_param *ev;
 	wmi_vdev_start_response_event_fixed_param *ev;