qcacld-3.0: Converge on struct mac_tspec_ie

The driver currently defines two different data structures to hold
a TSpec IE field:
- tSirMacTspecIE
- struct mac_tspec_ie

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: I2e9da1d72dae3c4b0baa13306ee7ec127895a4f2
CRs-Fixed: 2371911

core/mac/inc/sir_api.h

@@ -808,7 +808,7 @@ typedef struct ese_wmm_tspec_ie {
 
 typedef struct sTspecInfo {
 	uint8_t valid;
-	tSirMacTspecIE tspec;
+	struct mac_tspec_ie tspec;
 } tTspecInfo;
 
 #define SIR_ESE_MAX_TSPEC_IES   4
@@ -1604,7 +1604,7 @@ typedef struct sSirTclasInfo {
 
 typedef struct sSirAddtsReqInfo {
 	uint8_t dialogToken;
-	tSirMacTspecIE tspec;
+	struct mac_tspec_ie tspec;
 
 	uint8_t numTclas;       /* number of Tclas elements */
 	tSirTclasInfo tclasInfo[SIR_MAC_TCLASIE_MAXNUM];
@@ -1624,7 +1624,7 @@ typedef struct sSirAddtsRspInfo {
 	tSirMacStatusCodes status;
 	tSirMacTsDelayIE delay;
 
-	tSirMacTspecIE tspec;
+	struct mac_tspec_ie tspec;
 	uint8_t numTclas;       /* number of Tclas elements */
 	tSirTclasInfo tclasInfo[SIR_MAC_TCLASIE_MAXNUM];
 	uint8_t tclasProc;
@@ -1642,7 +1642,7 @@ typedef struct sSirAddtsRspInfo {
 
 typedef struct sSirDeltsReqInfo {
 	struct mac_ts_info tsinfo;
-	tSirMacTspecIE tspec;
+	struct mac_tspec_ie tspec;
 	uint8_t wmeTspecPresent:1;
 	uint8_t wsmTspecPresent:1;
 	uint8_t lleTspecPresent:1;

core/mac/inc/sir_mac_prot_def.h

@@ -1192,13 +1192,6 @@ typedef struct sSirMacEdcaParamSetIE {
 	tSirMacEdcaParamRecord acvo;    /* voice */
 } qdf_packed tSirMacEdcaParamSetIE;
 
-typedef struct sSirMacQoSParams {
-	uint8_t count;
-	uint16_t limit;
-	uint8_t CWmin[8];
-	uint8_t AIFS[8];
-} qdf_packed tSirMacQoSParams;
-
 /* ts info direction field can take any of these values */
 #define SIR_MAC_DIRECTION_UPLINK    0
 #define SIR_MAC_DIRECTION_DNLINK    1
@@ -1211,27 +1204,6 @@ typedef struct sSirMacQoSParams {
 #define SIR_MAC_ACCESSPOLICY_HCCA   2
 #define SIR_MAC_ACCESSPOLICY_BOTH   3
 
-typedef struct sSirMacTspecIE {
-	uint8_t type;
-	uint8_t length;
-	struct mac_ts_info tsinfo;
-	uint16_t nomMsduSz;
-	uint16_t maxMsduSz;
-	uint32_t minSvcInterval;
-	uint32_t maxSvcInterval;
-	uint32_t inactInterval;
-	uint32_t suspendInterval;
-	uint32_t svcStartTime;
-	uint32_t minDataRate;
-	uint32_t meanDataRate;
-	uint32_t peakDataRate;
-	uint32_t maxBurstSz;
-	uint32_t delayBound;
-	uint32_t minPhyRate;
-	uint16_t surplusBw;
-	uint16_t mediumTime;
-} qdf_packed tSirMacTspecIE;
-
 /* frame classifier types */
 #define SIR_MAC_TCLASTYPE_ETHERNET 0
 #define SIR_MAC_TCLASTYPE_TCPUDPIP 1

core/mac/src/include/parser_api.h

@@ -918,7 +918,8 @@ sir_beacon_ie_ese_bcn_report(struct mac_context *mac,
  *
  * Return: None
  */
-void ese_populate_wmm_tspec(tSirMacTspecIE *source, ese_wmm_tspec_ie *dest);
+void ese_populate_wmm_tspec(struct mac_tspec_ie *source,
+			    ese_wmm_tspec_ie *dest);
 
 #endif
 
@@ -942,9 +943,10 @@ QDF_STATUS
 populate_dot11f_wpa_opaque(struct mac_context *mac,
 			tpSirRSNie pRsnIe, tDot11fIEWPAOpaque *pDot11f);
 
-void populate_dot11f_tspec(tSirMacTspecIE *pOld, tDot11fIETSPEC *pDot11f);
+void populate_dot11f_tspec(struct mac_tspec_ie *pOld, tDot11fIETSPEC *pDot11f);
 
-void populate_dot11f_wmmtspec(tSirMacTspecIE *pOld, tDot11fIEWMMTSPEC *pDot11f);
+void populate_dot11f_wmmtspec(struct mac_tspec_ie *pOld,
+			      tDot11fIEWMMTSPEC *pDot11f);
 
 QDF_STATUS
 populate_dot11f_tclas(struct mac_context *mac,

core/mac/src/pe/include/lim_admit_control.h

@@ -35,14 +35,15 @@
 #include "ani_global.h"
 
 QDF_STATUS
-lim_tspec_find_by_assoc_id(struct mac_context *, uint16_t, tSirMacTspecIE *,
+lim_tspec_find_by_assoc_id(struct mac_context *, uint16_t,
+			   struct mac_tspec_ie *,
 			   tpLimTspecInfo, tpLimTspecInfo *);
 
 /* Add TSPEC in lim local table */
 QDF_STATUS lim_tspec_add(struct mac_context *mac,
 			    uint8_t *pAddr,
 			    uint16_t assocId,
-			    tSirMacTspecIE *pTspec,
+			    struct mac_tspec_ie *pTspec,
 			    uint32_t interval, tpLimTspecInfo *ppInfo);
 
 /* admit control interface */
@@ -75,13 +76,13 @@ QDF_STATUS lim_admit_control_init(struct mac_context *mac);
 QDF_STATUS lim_send_hal_msg_add_ts(struct mac_context *mac,
 				      uint16_t staIdx,
 				      uint8_t tspecIdx,
-				      tSirMacTspecIE tspecIE,
+				      struct mac_tspec_ie tspecIE,
 				      uint8_t sessionId, uint16_t tsm_interval);
 #else
 QDF_STATUS lim_send_hal_msg_add_ts(struct mac_context *mac,
 				      uint16_t staIdx,
 				      uint8_t tspecIdx,
-				      tSirMacTspecIE tspecIE,
+				      struct mac_tspec_ie tspecIE,
 				      uint8_t sessionId);
 #endif
 

core/mac/src/pe/include/lim_global.h

@@ -458,7 +458,7 @@ typedef struct sLimTspecInfo {
 	uint8_t idx;
 	tSirMacAddr staAddr;
 	uint16_t assocId;
-	tSirMacTspecIE tspec;
+	struct mac_tspec_ie tspec;
 	/* number of Tclas elements */
 	uint8_t numTclas;
 	tSirTclasInfo tclasInfo[SIR_MAC_TCLASIE_MAXNUM];

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

@@ -55,40 +55,21 @@
 /* ------------------------------------------------------------------------------ */
 /* local protos */
 
-static QDF_STATUS
-lim_calculate_svc_int(struct mac_context *, tSirMacTspecIE *, uint32_t *);
-static QDF_STATUS
-lim_validate_tspec_edca(struct mac_context *, tSirMacTspecIE *, struct pe_session *);
-static QDF_STATUS
-lim_validate_tspec(struct mac_context *, tSirMacTspecIE *, struct pe_session *);
-static void
-lim_compute_mean_bw_used(struct mac_context *, uint32_t *, uint32_t, tpLimTspecInfo,
-			 struct pe_session *);
 static void lim_get_available_bw(struct mac_context *, uint32_t *, uint32_t *, uint32_t,
 				 uint32_t);
-static QDF_STATUS lim_admit_policy_oversubscription(struct mac_context *,
-						       tSirMacTspecIE *,
-						       tpLimAdmitPolicyInfo,
-						       tpLimTspecInfo,
-						       struct pe_session *);
-static QDF_STATUS lim_tspec_find_by_sta_addr(struct mac_context *, uint8_t *,
-						tSirMacTspecIE *, tpLimTspecInfo,
-						tpLimTspecInfo *);
-static QDF_STATUS lim_validate_access_policy(struct mac_context *, uint8_t, uint16_t,
-						struct pe_session *);
 
 /** -------------------------------------------------------------
    \fn lim_calculate_svc_int
    \brief TSPEC validation and servcie interval determination
    \param     struct mac_context *   mac
-   \param         tSirMacTspecIE *pTspec
+   \param         struct mac_tspec_ie *pTspec
    \param         uint32_t            *pSvcInt
    \return QDF_STATUS - status of the comparison
    -------------------------------------------------------------*/
 
 static QDF_STATUS
 lim_calculate_svc_int(struct mac_context *mac,
-		      tSirMacTspecIE *pTspec, uint32_t *pSvcInt)
+		      struct mac_tspec_ie *pTspec, uint32_t *pSvcInt)
 {
 	uint32_t msduSz, dataRate;
 	*pSvcInt = 0;
@@ -145,7 +126,8 @@ lim_calculate_svc_int(struct mac_context *mac,
  **/
 static QDF_STATUS
 lim_validate_tspec_edca(struct mac_context *mac_ctx,
-			tSirMacTspecIE *tspec, struct pe_session *session_entry)
+			struct mac_tspec_ie *tspec,
+			struct pe_session *session_entry)
 {
 	uint32_t max_phy_rate, min_phy_rate;
 	uint32_t phy_mode;
@@ -175,13 +157,13 @@ lim_validate_tspec_edca(struct mac_context *mac_ctx,
    \fn lim_validate_tspec
    \brief validate the offered tspec
    \param   struct mac_context *mac
-   \param         tSirMacTspecIE *pTspec
+   \param         struct mac_tspec_ie *pTspec
    \return QDF_STATUS - status
    -------------------------------------------------------------*/
 
 static QDF_STATUS
 lim_validate_tspec(struct mac_context *mac,
-		   tSirMacTspecIE *pTspec, struct pe_session *pe_session)
+		   struct mac_tspec_ie *pTspec, struct pe_session *pe_session)
 {
 	QDF_STATUS retval = QDF_STATUS_SUCCESS;
 
@@ -296,7 +278,7 @@ lim_get_available_bw(struct mac_context *mac,
  **/
 static QDF_STATUS
 lim_admit_policy_oversubscription(struct mac_context *mac_ctx,
-				  tSirMacTspecIE *tspec,
+				  struct mac_tspec_ie *tspec,
 				  tpLimAdmitPolicyInfo admit_policy,
 				  tpLimTspecInfo tspec_info,
 				  struct pe_session *session_entry)
@@ -329,12 +311,12 @@ lim_admit_policy_oversubscription(struct mac_context *mac_ctx,
    \fn lim_admit_policy
    \brief determine the current admit control policy and apply it for the offered tspec
    \param   struct mac_context *mac
-   \param         tSirMacTspecIE   *pTspec
+   \param         struct mac_tspec_ie   *pTspec
    \return QDF_STATUS - status
    -------------------------------------------------------------*/
 
 static QDF_STATUS lim_admit_policy(struct mac_context *mac,
-				      tSirMacTspecIE *pTspec,
+				      struct mac_tspec_ie *pTspec,
 				      struct pe_session *pe_session)
 {
 	QDF_STATUS retval = QDF_STATUS_E_FAILURE;
@@ -394,7 +376,7 @@ static void lim_tspec_delete(struct mac_context *mac, tpLimTspecInfo pInfo)
    \brief Send halMsg_AddTs to HAL
    \param   struct mac_context *mac
    \param   \param       uint8_t               *pAddr
-   \param       tSirMacTspecIE    *pTspecIE
+   \param       struct mac_tspec_ie    *pTspecIE
    \param       tpLimTspecInfo    pTspecList
    \param       tpLimTspecInfo   *ppInfo
    \return QDF_STATUS - status
@@ -404,7 +386,7 @@ static void lim_tspec_delete(struct mac_context *mac, tpLimTspecInfo pInfo)
 static QDF_STATUS
 lim_tspec_find_by_sta_addr(struct mac_context *mac,
 			   uint8_t *pAddr,
-			   tSirMacTspecIE *pTspecIE,
+			   struct mac_tspec_ie *pTspecIE,
 			   tpLimTspecInfo pTspecList, tpLimTspecInfo *ppInfo)
 {
 	int ctspec;
@@ -412,14 +394,11 @@ lim_tspec_find_by_sta_addr(struct mac_context *mac,
 	*ppInfo = NULL;
 
 	for (ctspec = 0; ctspec < LIM_NUM_TSPEC_MAX; ctspec++, pTspecList++) {
-		if ((pTspecList->inuse)
-		    &&
-		    (!qdf_mem_cmp
-			     (pAddr, pTspecList->staAddr, sizeof(pTspecList->staAddr)))
-		    &&
-		    (!qdf_mem_cmp
-			     ((uint8_t *) pTspecIE, (uint8_t *) &pTspecList->tspec,
-			     sizeof(tSirMacTspecIE)))) {
+		if ((pTspecList->inuse) &&
+		    (!qdf_mem_cmp(pAddr, pTspecList->staAddr,
+				  sizeof(pTspecList->staAddr))) &&
+		    (!qdf_mem_cmp(pTspecIE, &pTspecList->tspec,
+				  sizeof(*pTspecIE)))) {
 			*ppInfo = pTspecList;
 			return QDF_STATUS_SUCCESS;
 		}
@@ -432,7 +411,7 @@ lim_tspec_find_by_sta_addr(struct mac_context *mac,
    \brief find tspec with matchin staid and Tspec
    \param   struct mac_context *mac
    \param       uint32_t               staid
-   \param       tSirMacTspecIE    *pTspecIE
+   \param       struct mac_tspec_ie    *pTspecIE
    \param       tpLimTspecInfo    pTspecList
    \param       tpLimTspecInfo   *ppInfo
    \return QDF_STATUS - status
@@ -441,7 +420,7 @@ lim_tspec_find_by_sta_addr(struct mac_context *mac,
 QDF_STATUS
 lim_tspec_find_by_assoc_id(struct mac_context *mac,
 			   uint16_t assocId,
-			   tSirMacTspecIE *pTspecIE,
+			   struct mac_tspec_ie *pTspecIE,
 			   tpLimTspecInfo pTspecList, tpLimTspecInfo *ppInfo)
 {
 	int ctspec;
@@ -453,12 +432,10 @@ lim_tspec_find_by_assoc_id(struct mac_context *mac,
 		pTspecIE->tsinfo.traffic.tsid);
 
 	for (ctspec = 0; ctspec < LIM_NUM_TSPEC_MAX; ctspec++, pTspecList++) {
-		if ((pTspecList->inuse)
-		    && (assocId == pTspecList->assocId)
-		    &&
-		    (!qdf_mem_cmp
-			     ((uint8_t *) pTspecIE, (uint8_t *) &pTspecList->tspec,
-			     sizeof(tSirMacTspecIE)))) {
+		if ((pTspecList->inuse) &&
+		    (assocId == pTspecList->assocId) &&
+		    (!qdf_mem_cmp(pTspecIE, &pTspecList->tspec,
+				  sizeof(*pTspecIE)))) {
 			*ppInfo = pTspecList;
 			return QDF_STATUS_SUCCESS;
 		}
@@ -510,7 +487,7 @@ lim_find_tspec(struct mac_context *mac,
    \param struct mac_context *   mac
    \param uint8_t               *pAddr
    \param uint16_t               assocId
-   \param tSirMacTspecIE   *pTspec
+   \param struct mac_tspec_ie   *pTspec
    \param uint32_t               interval
    \param tpLimTspecInfo   *ppInfo
 
@@ -520,7 +497,7 @@ lim_find_tspec(struct mac_context *mac,
 QDF_STATUS lim_tspec_add(struct mac_context *mac,
 			    uint8_t *pAddr,
 			    uint16_t assocId,
-			    tSirMacTspecIE *pTspec,
+			    struct mac_tspec_ie *pTspec,
 			    uint32_t interval, tpLimTspecInfo *ppInfo)
 {
 	tpLimTspecInfo pTspecList = &mac->lim.tspecInfo[0];
@@ -821,7 +798,7 @@ QDF_STATUS lim_admit_control_init(struct mac_context *mac)
    \param   struct mac_context *mac
    \param     uint16_t        staIdx
    \param     uint8_t         tspecIdx
-   \param       tSirMacTspecIE tspecIE
+   \param       struct mac_tspec_ie tspecIE
    \param       tSirTclasInfo   *tclasInfo
    \param       uint8_t           tclasProc
    \param       uint16_t          tsm_interval
@@ -832,13 +809,15 @@ QDF_STATUS
 lim_send_hal_msg_add_ts(struct mac_context *mac,
 			uint16_t staIdx,
 			uint8_t tspecIdx,
-			tSirMacTspecIE tspecIE,
+			struct mac_tspec_ie tspecIE,
 			uint8_t sessionId, uint16_t tsm_interval)
 #else
 QDF_STATUS
 lim_send_hal_msg_add_ts(struct mac_context *mac,
 			uint16_t staIdx,
-			uint8_t tspecIdx, tSirMacTspecIE tspecIE, uint8_t sessionId)
+			uint8_t tspecIdx,
+			struct mac_tspec_ie tspecIE,
+			uint8_t sessionId)
 #endif
 {
 	struct scheduler_msg msg = {0};
@@ -858,7 +837,8 @@ lim_send_hal_msg_add_ts(struct mac_context *mac,
 
 	pAddTsParam->staIdx = staIdx;
 	pAddTsParam->tspecIdx = tspecIdx;
-	qdf_mem_copy(&pAddTsParam->tspec, &tspecIE, sizeof(tSirMacTspecIE));
+	qdf_mem_copy(&pAddTsParam->tspec, &tspecIE,
+		     sizeof(struct mac_tspec_ie));
 	pAddTsParam->sessionId = sessionId;
 	pAddTsParam->sme_session_id = pe_session->smeSessionId;
 

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

@@ -971,7 +971,7 @@ QDF_STATUS lim_process_ft_aggr_qos_req(struct mac_context *mac, uint32_t *pMsgBu
 
 	for (i = 0; i < HAL_QOS_NUM_AC_MAX; i++) {
 		if (aggrQosReq->aggrInfo.tspecIdx & (1 << i)) {
-			tSirMacTspecIE *pTspec =
+			struct mac_tspec_ie *pTspec =
 				&aggrQosReq->aggrInfo.aggrAddTsInfo[i].tspec;
 			/* Since AddTS response was successful, check for the PSB flag
 			 * and directional flag inside the TS Info field.

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

@@ -400,17 +400,18 @@ static void lim_process_hw_mode_trans_ind(struct mac_context *mac, void *body)
 	return;
 }
 
-/** -------------------------------------------------------------
-   \fn def_msg_decision
-   \brief The function decides whether to defer a message or not in limProcessMessage function
-   \param   struct mac_context *mac
-   \param       struct scheduler_msg  limMsg
-   \param       tSirMacTspecIE   *ppInfo
-   \return none
-   -------------------------------------------------------------*/
-
-static uint8_t def_msg_decision(struct mac_context *mac_ctx,
-				struct scheduler_msg *lim_msg)
+/**
+ * def_msg_decision() - Should a message be deferred?
+ * @mac_ctx: The global MAC context
+ * @lim_msg: The message to check for potential deferral
+ *
+ * This function decides whether to defer a message or not in
+ * lim_message_processor() function
+ *
+ * Return: true if the message can be deferred, false otherwise
+ */
+static bool def_msg_decision(struct mac_context *mac_ctx,
+			     struct scheduler_msg *lim_msg)
 {
 	uint8_t type, subtype;
 	QDF_STATUS status;

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

@@ -1388,7 +1388,7 @@ lim_send_delts_req_action_frame(struct mac_context *mac,
 				tSirMacAddr peer,
 				uint8_t wmmTspecPresent,
 				struct mac_ts_info *pTsinfo,
-				tSirMacTspecIE *pTspecIe,
+				struct mac_tspec_ie *pTspecIe,
 				struct pe_session *pe_session)
 {
 	uint8_t *pFrame;

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

@@ -1428,8 +1428,9 @@ lim_send_sme_set_context_rsp(struct mac_context *mac,
    \sa
    ----------------------------------------------------------------- */
 void
-lim_send_sme_addts_rsp(struct mac_context *mac, uint8_t rspReqd, uint32_t status,
-		       struct pe_session *pe_session, tSirMacTspecIE tspec,
+lim_send_sme_addts_rsp(struct mac_context *mac, uint8_t rspReqd,
+		       uint32_t status,
+		       struct pe_session *pe_session, struct mac_tspec_ie tspec,
 		       uint8_t smesessionId, uint16_t smetransactionId)
 {
 	tpSirAddtsRsp rsp;

core/mac/src/pe/lim/lim_send_sme_rsp_messages.h

@@ -77,15 +77,18 @@ void
 lim_send_sme_aggr_qos_rsp(struct mac_context *mac, tpSirAggrQosRsp aggrQosRsp,
 			  uint8_t smesessionId);
 
-void lim_send_sme_addts_rsp(struct mac_context *mac, uint8_t rspReqd, uint32_t status,
-			    struct pe_session *pe_session, tSirMacTspecIE tspec,
+void lim_send_sme_addts_rsp(struct mac_context *mac,
+			    uint8_t rspReqd, uint32_t status,
+			    struct pe_session *pe_session,
+			    struct mac_tspec_ie tspec,
 			    uint8_t smesessionId, uint16_t smetransactionId);
 void lim_send_sme_delts_rsp(struct mac_context *mac, tpSirDeltsReq delts,
 			    uint32_t status, struct pe_session *pe_session,
 			    uint8_t smessionId, uint16_t smetransactionId);
 void lim_send_sme_delts_ind(struct mac_context *mac, tpSirDeltsReqInfo delts,
 			    uint16_t aid, struct pe_session *);
-void lim_send_sme_stats_rsp(struct mac_context *mac, uint16_t msgtype, void *stats);
+void lim_send_sme_stats_rsp(struct mac_context *mac, uint16_t msgtype,
+			    void *stats);
 
 #ifdef QCA_SUPPORT_CP_STATS
 static inline void lim_send_sme_pe_statistics_rsp(struct mac_context *mac,

core/mac/src/pe/lim/lim_types.h

@@ -607,7 +607,7 @@ static inline void lim_send_obss_color_collision_cfg(struct mac_context *mac_ctx
 void lim_send_delts_req_action_frame(struct mac_context *mac, tSirMacAddr peer,
 				     uint8_t wmmTspecPresent,
 				     struct mac_ts_info * pTsinfo,
-				     tSirMacTspecIE * pTspecIe,
+				     struct mac_tspec_ie * pTspecIe,
 				     struct pe_session *pe_session);
 void lim_send_addts_req_action_frame(struct mac_context *mac, tSirMacAddr peerMacAddr,
 				     tSirAddtsReqInfo *addts, struct pe_session *);

core/mac/src/sys/legacy/src/utils/inc/utils_parser.h

@@ -69,9 +69,12 @@ void convert_edca_param(struct mac_context *, tSirMacEdcaParamSetIE *,
 void convert_mu_edca_param(struct mac_context * mac_ctx,
 			tSirMacEdcaParamSetIE *mu_edca,
 			tDot11fIEmu_edca_param_set *ie);
-void convert_tspec(struct mac_context *, tSirMacTspecIE *, tDot11fIETSPEC *);
-QDF_STATUS convert_tclas(struct mac_context *, tSirTclasInfo *, tDot11fIETCLAS *);
-void convert_wmmtspec(struct mac_context *, tSirMacTspecIE *, tDot11fIEWMMTSPEC *);
+void convert_tspec(struct mac_context *, struct mac_tspec_ie *,
+		   tDot11fIETSPEC *);
+QDF_STATUS convert_tclas(struct mac_context *, tSirTclasInfo *,
+			 tDot11fIETCLAS *);
+void convert_wmmtspec(struct mac_context *, struct mac_tspec_ie *,
+		      tDot11fIEWMMTSPEC *);
 QDF_STATUS convert_wmmtclas(struct mac_context *, tSirTclasInfo *,
 			    tDot11fIEWMMTCLAS *);
 void convert_ts_delay(struct mac_context *, tSirMacTsDelayIE *, tDot11fIETSDelay *);

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -1734,8 +1734,8 @@ void populate_dot11f_re_assoc_tspec(struct mac_context *mac,
 	}
 }
 
-void ese_populate_wmm_tspec(tSirMacTspecIE *source,
-	ese_wmm_tspec_ie *dest)
+void ese_populate_wmm_tspec(struct mac_tspec_ie *source,
+			    ese_wmm_tspec_ie *dest)
 {
 	dest->traffic_type = source->tsinfo.traffic.trafficType;
 	dest->tsid = source->tsinfo.traffic.tsid;
@@ -4647,7 +4647,7 @@ sir_convert_meas_req_frame2_struct(struct mac_context *mac,
 } /* End sir_convert_meas_req_frame2_struct. */
 #endif
 
-void populate_dot11f_tspec(tSirMacTspecIE *pOld, tDot11fIETSPEC *pDot11f)
+void populate_dot11f_tspec(struct mac_tspec_ie *pOld, tDot11fIETSPEC *pDot11f)
 {
 	pDot11f->traffic_type = pOld->tsinfo.traffic.trafficType;
 	pDot11f->tsid = pOld->tsinfo.traffic.tsid;
@@ -4682,7 +4682,8 @@ void populate_dot11f_tspec(tSirMacTspecIE *pOld, tDot11fIETSPEC *pDot11f)
 
 } /* End populate_dot11f_tspec. */
 
-void populate_dot11f_wmmtspec(tSirMacTspecIE *pOld, tDot11fIEWMMTSPEC *pDot11f)
+void populate_dot11f_wmmtspec(struct mac_tspec_ie *pOld,
+			      tDot11fIEWMMTSPEC *pDot11f)
 {
 	pDot11f->traffic_type = pOld->tsinfo.traffic.trafficType;
 	pDot11f->tsid = pOld->tsinfo.traffic.tsid;

core/mac/src/sys/legacy/src/utils/src/utils_parser.c

@@ -32,27 +32,27 @@
 #include "utils_parser.h"
 #include "lim_ser_des_utils.h"
 
-void convert_ssid(struct mac_context * mac, tSirMacSSid *pOld, tDot11fIESSID *pNew)
+void convert_ssid(struct mac_context *mac, tSirMacSSid *pOld, tDot11fIESSID *pNew)
 {
 	pOld->length = pNew->num_ssid;
 	qdf_mem_copy(pOld->ssId, pNew->ssid, pNew->num_ssid);
 }
 
-void convert_supp_rates(struct mac_context * mac,
+void convert_supp_rates(struct mac_context *mac,
 			tSirMacRateSet *pOld, tDot11fIESuppRates *pNew)
 {
 	pOld->numRates = pNew->num_rates;
 	qdf_mem_copy(pOld->rate, pNew->rates, pNew->num_rates);
 }
 
-void convert_ext_supp_rates(struct mac_context * mac,
+void convert_ext_supp_rates(struct mac_context *mac,
 			    tSirMacRateSet *pOld, tDot11fIEExtSuppRates *pNew)
 {
 	pOld->numRates = pNew->num_rates;
 	qdf_mem_copy(pOld->rate, pNew->rates, pNew->num_rates);
 }
 
-void convert_qos_caps(struct mac_context * mac,
+void convert_qos_caps(struct mac_context *mac,
 		      tSirMacQosCapabilityIE *pOld, tDot11fIEQOSCapsAp *pNew)
 {
 	pOld->type = 46;
@@ -61,7 +61,7 @@ void convert_qos_caps(struct mac_context * mac,
 	pOld->qosInfo.count = pNew->count;
 }
 
-void convert_qos_caps_station(struct mac_context * mac,
+void convert_qos_caps_station(struct mac_context *mac,
 			      tSirMacQosCapabilityStaIE *pOld,
 			      tDot11fIEQOSCapsStation *pNew)
 {
@@ -77,7 +77,7 @@ void convert_qos_caps_station(struct mac_context * mac,
 	pOld->qosInfo.acvo_uapsd = pNew->acvo_uapsd;
 }
 
-QDF_STATUS convert_wpa(struct mac_context * mac,
+QDF_STATUS convert_wpa(struct mac_context *mac,
 		       tSirMacWpaInfo *pOld, tDot11fIEWPA *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into an */
@@ -97,7 +97,7 @@ QDF_STATUS convert_wpa(struct mac_context * mac,
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS convert_wpa_opaque(struct mac_context * mac,
+QDF_STATUS convert_wpa_opaque(struct mac_context *mac,
 			      tSirMacWpaInfo *pOld, tDot11fIEWPAOpaque *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into */
@@ -113,7 +113,7 @@ QDF_STATUS convert_wpa_opaque(struct mac_context * mac,
 }
 
 #ifdef FEATURE_WLAN_WAPI
-QDF_STATUS convert_wapi_opaque(struct mac_context * mac,
+QDF_STATUS convert_wapi_opaque(struct mac_context *mac,
 			       tSirMacWapiInfo *pOld,
 			       tDot11fIEWAPIOpaque *pNew)
 {
@@ -126,7 +126,7 @@ QDF_STATUS convert_wapi_opaque(struct mac_context * mac,
 }
 #endif
 
-QDF_STATUS convert_wsc_opaque(struct mac_context * mac,
+QDF_STATUS convert_wsc_opaque(struct mac_context *mac,
 			      tSirAddie *pOld, tDot11fIEWscIEOpaque *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into */
@@ -145,7 +145,7 @@ QDF_STATUS convert_wsc_opaque(struct mac_context * mac,
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS convert_p2p_opaque(struct mac_context * mac,
+QDF_STATUS convert_p2p_opaque(struct mac_context *mac,
 			      tSirAddie *pOld, tDot11fIEP2PIEOpaque *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into */
@@ -165,7 +165,7 @@ QDF_STATUS convert_p2p_opaque(struct mac_context * mac,
 }
 
 #ifdef WLAN_FEATURE_WFD
-QDF_STATUS convert_wfd_opaque(struct mac_context * mac,
+QDF_STATUS convert_wfd_opaque(struct mac_context *mac,
 			      tSirAddie *pOld, tDot11fIEWFDIEOpaque *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into */
@@ -185,7 +185,7 @@ QDF_STATUS convert_wfd_opaque(struct mac_context * mac,
 }
 #endif
 
-QDF_STATUS convert_rsn(struct mac_context * mac,
+QDF_STATUS convert_rsn(struct mac_context *mac,
 		       tSirMacRsnInfo *pOld, tDot11fIERSN *pNew)
 {
 	uint8_t buffer[257];
@@ -203,7 +203,7 @@ QDF_STATUS convert_rsn(struct mac_context * mac,
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS convert_rsn_opaque(struct mac_context * mac,
+QDF_STATUS convert_rsn_opaque(struct mac_context *mac,
 			      tSirMacRsnInfo *pOld, tDot11fIERSNOpaque *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into */
@@ -214,7 +214,7 @@ QDF_STATUS convert_rsn_opaque(struct mac_context * mac,
 	return QDF_STATUS_SUCCESS;
 }
 
-void convert_power_caps(struct mac_context * mac,
+void convert_power_caps(struct mac_context *mac,
 			tSirMacPowerCapabilityIE *pOld,
 			tDot11fIEPowerCaps *pNew)
 {
@@ -224,7 +224,7 @@ void convert_power_caps(struct mac_context * mac,
 	pOld->maxTxPower = pNew->maxTxPower;
 }
 
-void convert_supp_channels(struct mac_context * mac,
+void convert_supp_channels(struct mac_context *mac,
 			   tSirMacSupportedChannelIE *pOld,
 			   tDot11fIESuppChannels *pNew)
 {
@@ -234,7 +234,7 @@ void convert_supp_channels(struct mac_context * mac,
 		     (uint8_t *) pNew->bands, pOld->length);
 }
 
-void convert_cf_params(struct mac_context * mac,
+void convert_cf_params(struct mac_context *mac,
 		       tSirMacCfParamSet *pOld, tDot11fIECFParams *pNew)
 {
 	pOld->cfpCount = pNew->cfp_count;
@@ -243,7 +243,7 @@ void convert_cf_params(struct mac_context * mac,
 	pOld->cfpDurRemaining = pNew->cfp_durremaining;
 }
 
-void convert_fh_params(struct mac_context * mac,
+void convert_fh_params(struct mac_context *mac,
 		       tSirMacFHParamSet *pOld, tDot11fIEFHParamSet *pNew)
 {
 	pOld->dwellTime = pNew->dwell_time;
@@ -252,7 +252,7 @@ void convert_fh_params(struct mac_context * mac,
 	pOld->hopIndex = pNew->hop_index;
 }
 
-void convert_tim(struct mac_context * mac, tSirMacTim *pOld, tDot11fIETIM *pNew)
+void convert_tim(struct mac_context *mac, tSirMacTim *pOld, tDot11fIETIM *pNew)
 {
 	pOld->dtimCount = pNew->dtim_count;
 	pOld->dtimPeriod = pNew->dtim_period;
@@ -262,7 +262,7 @@ void convert_tim(struct mac_context * mac, tSirMacTim *pOld, tDot11fIETIM *pNew)
 	qdf_mem_copy(pOld->bitmap, pNew->vbmp, pNew->num_vbmp);
 }
 
-void convert_country(struct mac_context * mac,
+void convert_country(struct mac_context *mac,
 		     tSirCountryInformation *pOld, tDot11fIECountry *pNew)
 {
 	int i;
@@ -280,7 +280,7 @@ void convert_country(struct mac_context * mac,
 	}
 }
 
-void convert_wmm_params(struct mac_context * mac,
+void convert_wmm_params(struct mac_context *mac,
 			tSirMacEdcaParamSetIE *pOld, tDot11fIEWMMParams *pNew)
 {
 	pOld->type = 221;
@@ -318,7 +318,7 @@ void convert_wmm_params(struct mac_context * mac,
 	pOld->acvo.txoplimit = pNew->acvo_txoplimit;
 }
 
-void convert_erp_info(struct mac_context * mac,
+void convert_erp_info(struct mac_context *mac,
 		      tSirMacErpInfo *pOld, tDot11fIEERPInfo *pNew)
 {
 	pOld->nonErpPresent = pNew->non_erp_present;
@@ -326,7 +326,7 @@ void convert_erp_info(struct mac_context * mac,
 	pOld->barkerPreambleMode = pNew->barker_preamble;
 }
 
-void convert_edca_param(struct mac_context * mac,
+void convert_edca_param(struct mac_context *mac,
 			tSirMacEdcaParamSetIE *pOld,
 			tDot11fIEEDCAParamSet *pNew)
 {
@@ -365,7 +365,7 @@ void convert_edca_param(struct mac_context * mac,
 
 }
 
-void convert_mu_edca_param(struct mac_context * mac_ctx,
+void convert_mu_edca_param(struct mac_context *mac_ctx,
 			tSirMacEdcaParamSetIE *mu_edca,
 			tDot11fIEmu_edca_param_set *ie)
 {
@@ -401,8 +401,8 @@ void convert_mu_edca_param(struct mac_context * mac_ctx,
 
 }
 
-void convert_tspec(struct mac_context * mac,
-		   tSirMacTspecIE *pOld, tDot11fIETSPEC *pNew)
+void convert_tspec(struct mac_context *mac,
+		   struct mac_tspec_ie *pOld, tDot11fIETSPEC *pNew)
 {
 	pOld->tsinfo.traffic.trafficType = (uint16_t) pNew->traffic_type;
 	pOld->tsinfo.traffic.tsid = (uint16_t) pNew->tsid;
@@ -432,7 +432,7 @@ void convert_tspec(struct mac_context * mac,
 	pOld->mediumTime = pNew->medium_time;
 }
 
-QDF_STATUS convert_tclas(struct mac_context * mac,
+QDF_STATUS convert_tclas(struct mac_context *mac,
 			 tSirTclasInfo *pOld, tDot11fIETCLAS *pNew)
 {
 	uint32_t length = 0;
@@ -508,8 +508,8 @@ QDF_STATUS convert_tclas(struct mac_context * mac,
 	return QDF_STATUS_SUCCESS;
 }
 
-void convert_wmmtspec(struct mac_context * mac,
-		      tSirMacTspecIE *pOld, tDot11fIEWMMTSPEC *pNew)
+void convert_wmmtspec(struct mac_context *mac,
+		      struct mac_tspec_ie *pOld, tDot11fIEWMMTSPEC *pNew)
 {
 	pOld->tsinfo.traffic.trafficType = (uint16_t) pNew->traffic_type;
 	pOld->tsinfo.traffic.tsid = (uint16_t) pNew->tsid;
@@ -536,7 +536,7 @@ void convert_wmmtspec(struct mac_context * mac,
 	pOld->mediumTime = pNew->medium_time;
 }
 
-QDF_STATUS convert_wmmtclas(struct mac_context * mac,
+QDF_STATUS convert_wmmtclas(struct mac_context *mac,
 			    tSirTclasInfo *pOld, tDot11fIEWMMTCLAS *pNew)
 {
 	uint32_t length = 0;
@@ -612,7 +612,7 @@ QDF_STATUS convert_wmmtclas(struct mac_context * mac,
 	return QDF_STATUS_SUCCESS;
 }
 
-void convert_ts_delay(struct mac_context * mac,
+void convert_ts_delay(struct mac_context *mac,
 		      tSirMacTsDelayIE *pOld, tDot11fIETSDelay *pNew)
 {
 	pOld->type = DOT11F_EID_TSDELAY;
@@ -620,7 +620,7 @@ void convert_ts_delay(struct mac_context * mac,
 	pOld->delay = pNew->delay;
 }
 
-void convert_schedule(struct mac_context * mac,
+void convert_schedule(struct mac_context *mac,
 		      tSirMacScheduleIE *pOld, tDot11fIESchedule *pNew)
 {
 	pOld->type = DOT11F_EID_SCHEDULE;
@@ -635,7 +635,7 @@ void convert_schedule(struct mac_context * mac,
 	pOld->specInterval = pNew->spec_interval;
 }
 
-void convert_wmm_schedule(struct mac_context * mac,
+void convert_wmm_schedule(struct mac_context *mac,
 			  tSirMacScheduleIE *pOld, tDot11fIEWMMSchedule *pNew)
 {
 	pOld->type = DOT11F_EID_WMMSCHEDULE;
@@ -650,7 +650,7 @@ void convert_wmm_schedule(struct mac_context * mac,
 	pOld->specInterval = pNew->spec_interval;
 }
 
-void convert_qos_mapset_frame(struct mac_context * mac, tSirQosMapSet *Qos,
+void convert_qos_mapset_frame(struct mac_context *mac, tSirQosMapSet *Qos,
 			      tDot11fIEQosMapSet *dot11fIE)
 {
 	uint8_t i, j = 0;

core/sme/src/qos/sme_qos.c

@@ -3011,7 +3011,7 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(struct mac_context *mac,
  */
 static void sme_qos_copy_tspec_info(struct mac_context *mac,
 				    struct sme_qos_wmmtspecinfo *pTspec_Info,
-				    tSirMacTspecIE *pTspec)
+				    struct mac_tspec_ie *pTspec)
 {
 	/* As per WMM_AC_testplan_v0.39 Minimum Service Interval, Maximum
 	 * Service Interval, Service Start Time, Suspension Interval and Delay

core/wma/inc/wma_if.h

@@ -953,7 +953,7 @@ typedef struct sLinkStateParams {
 typedef struct {
 	uint16_t staIdx;
 	uint16_t tspecIdx;
-	tSirMacTspecIE tspec;
+	struct mac_tspec_ie tspec;
 	QDF_STATUS status;
 	uint8_t sessionId;
 #ifdef FEATURE_WLAN_ESE
@@ -1003,7 +1003,7 @@ typedef struct {
 typedef struct {
 	uint16_t staIdx;
 	uint16_t tspecIdx;
-	tSirMacTspecIE tspec[HAL_QOS_NUM_AC_MAX];
+	struct mac_tspec_ie tspec[HAL_QOS_NUM_AC_MAX];
 	QDF_STATUS status[HAL_QOS_NUM_AC_MAX];
 	uint8_t sessionId;
 	uint8_t vdev_id;