qcacld-3.0: Converge on struct del_ts_param

The driver currently defines two different data structures to hold
Delete Tspec parameters:
- tDelTsParams
- struct del_ts_param

In this case having two different structures to provide the same
functionality is pointless. Furthermore, due to the way in which these
structures are used, there is an implicit requirement that they be
exactly identical. This approach is very fragile. To align with the
converged software architecture and to improve code maintainability
remove the legacy typedef and exclusively use the unified WMI
structure.

Change-Id: Ia70b1e17e4446259ff32107ffbc11646d078e1c0
CRs-Fixed: 2371915

core/mac/src/pe/lim/lim_admit_control.c

@@ -888,10 +888,10 @@ lim_send_hal_msg_del_ts(struct mac_context *mac,
 			uint8_t sessionId, uint8_t *bssId)
 {
 	struct scheduler_msg msg = {0};
-	tpDelTsParams pDelTsParam;
+	struct del_ts_params *pDelTsParam;
 	struct pe_session *pe_session = NULL;
 
-	pDelTsParam = qdf_mem_malloc(sizeof(tDelTsParams));
+	pDelTsParam = qdf_mem_malloc(sizeof(*pDelTsParam));
 	if (!pDelTsParam)
 		return QDF_STATUS_E_NOMEM;
 

core/wma/inc/wma_if.h

@@ -939,31 +939,6 @@ typedef struct sLinkStateParams {
 	bool status;
 } tLinkStateParams, *tpLinkStateParams;
 
-/**
- * struct tDelTsParams - DELTS related parameters
- * @staIdx: station index
- * @tspecIdx: TSPEC identifier uniquely identifying a TSPEC for a STA in a BSS
- * @bssId: BSSID
- * @sessionId: session id
- * @userPrio: user priority
- * @delTsInfo: DELTS info
- * @setRICparams: RIC parameters
- */
-typedef struct {
-	uint16_t staIdx;
-	uint16_t tspecIdx;
-	tSirMacAddr bssId;
-	uint8_t sessionId;
-	uint8_t userPrio;
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
-	struct delts_req_info delTsInfo;
-	uint8_t setRICparams;
-#endif /* WLAN_FEATURE_ROAM_OFFLOAD */
-} tDelTsParams, *tpDelTsParams;
-
-typedef QDF_STATUS (*tHalMsgCallback)(struct mac_context *mac, uint32_t mesgId,
-				      void *mesgParam);
-
 /**
  * struct tEdcaParams - EDCA parameters
  * @bssIdx: BSSID index

core/wma/inc/wma_internal.h

@@ -1074,7 +1074,7 @@ int wma_d0_wow_disable_ack_event(void *handle, uint8_t *event, uint32_t len);
 
 int wma_pdev_resume_event_handler(void *handle, uint8_t *event, uint32_t len);
 
-void wma_del_ts_req(tp_wma_handle wma, tDelTsParams *msg);
+void wma_del_ts_req(tp_wma_handle wma, struct del_ts_params *msg);
 
 /**
  * wma_aggr_qos_req() - send aggr qos request to fw

core/wma/src/wma_features.c

@@ -2992,7 +2992,7 @@ int wma_pdev_resume_event_handler(void *handle, uint8_t *event, uint32_t len)
  *
  * Return: none
  */
-void wma_del_ts_req(tp_wma_handle wma, tDelTsParams *msg)
+void wma_del_ts_req(tp_wma_handle wma, struct del_ts_params *msg)
 {
 	if (!wma_is_vdev_valid(msg->sessionId)) {
 		WMA_LOGE("%s: vdev id:%d is not active ", __func__,

core/wma/src/wma_main.c

@@ -8178,7 +8178,7 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg)
 		break;
 
 	case WMA_DEL_TS_REQ:
-		wma_del_ts_req(wma_handle, (tDelTsParams *) msg->bodyptr);
+		wma_del_ts_req(wma_handle, msg->bodyptr);
 		break;
 
 	case WMA_AGGR_QOS_REQ: