Parcourir la source

qcacld-3.0: Replace tpPESession in lim_ft

To align with the Linux coding style replace tpPESession with struct
pe_session * in lim_ft.

Change-Id: I3e4409755a53e31d2a39410ad5afd477cf80322a
CRs-Fixed: 2354282
Jeff Johnson il y a 6 ans
Parent
commit
a14b0b39d1
3 fichiers modifiés avec 42 ajouts et 42 suppressions
  1. 19 19
      core/mac/src/pe/include/lim_ft.h
  2. 10 10
      core/mac/src/pe/lim/lim_ft.c
  3. 13 13
      core/mac/src/pe/lim/lim_ft_preauth.c

+ 19 - 19
core/mac/src/pe/include/lim_ft.h

@@ -33,11 +33,11 @@
 /*-------------------------------------------------------------------------
    Function declarations and documenation
    ------------------------------------------------------------------------*/
-void lim_ft_open(tpAniSirGlobal mac, tpPESession psessionEntry);
-void lim_ft_cleanup(tpAniSirGlobal mac, tpPESession psessionEntry);
+void lim_ft_open(tpAniSirGlobal mac, struct pe_session *psessionEntry);
+void lim_ft_cleanup(tpAniSirGlobal mac, struct pe_session *psessionEntry);
 #ifdef WLAN_FEATURE_HOST_ROAM
 void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal mac,
-		tpPESession psessionEntry);
+		struct pe_session *psessionEntry);
 int lim_process_ft_pre_auth_req(tpAniSirGlobal mac,
 				struct scheduler_msg *pMsg);
 void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac);
@@ -54,18 +54,18 @@ void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac);
 void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal mac,
 				    tLimMlmReassocReq *reassoc_req);
 void lim_perform_ft_pre_auth(tpAniSirGlobal mac, QDF_STATUS status,
-		uint32_t *data, tpPESession psessionEntry);
+		uint32_t *data, struct pe_session *psessionEntry);
 void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac, QDF_STATUS status,
 		uint8_t *auth_rsp, uint16_t auth_rsp_length,
-		tpPESession psessionEntry);
+		struct pe_session *psessionEntry);
 void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal mac, QDF_STATUS status,
 		uint8_t *auth_rsp, uint16_t auth_rsp_len,
-		tpPESession psessionEntry);
+		struct pe_session *psessionEntry);
 QDF_STATUS lim_ft_setup_auth_session(tpAniSirGlobal mac,
-		tpPESession psessionEntry);
+		struct pe_session *psessionEntry);
 void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg);
 void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal mac,
-		struct scheduler_msg *limMsgQ, tpPESession psessionEntry);
+		struct scheduler_msg *limMsgQ, struct pe_session *psessionEntry);
 void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx,
 				 tLimMlmReassocReq *reassoc_req);
 void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx,
@@ -73,10 +73,10 @@ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx,
 				uint8_t session_id,
 				uint32_t scan_id);
 QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx,
-		tpPESession session_entry, tSirFTPreAuthReq *ft_preauth_req);
+		struct pe_session *session_entry, tSirFTPreAuthReq *ft_preauth_req);
 #else
 static inline void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal mac,
-		tpPESession psessionEntry)
+		struct pe_session *psessionEntry)
 {}
 static inline void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac)
 {}
@@ -86,13 +86,13 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal mac,
 {}
 static inline void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal mac,
 		QDF_STATUS status, uint8_t *auth_rsp,
-		uint16_t auth_rsp_len, tpPESession psessionEntry)
+		uint16_t auth_rsp_len, struct pe_session *psessionEntry)
 {}
 static inline void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx,
 		uint32_t *msg)
 {}
 static inline void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal mac,
-		struct scheduler_msg *limMsgQ, tpPESession psessionEntry)
+		struct scheduler_msg *limMsgQ, struct pe_session *psessionEntry)
 {}
 static inline void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx,
 					       tLimMlmReassocReq *reassoc_req)
@@ -111,21 +111,21 @@ static inline int lim_process_ft_pre_auth_req(tpAniSirGlobal mac,
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
 void lim_fill_ft_session(tpAniSirGlobal mac,
 		tpSirBssDescription pbssDescription,
-		tpPESession pftSessionEntry,
-		tpPESession psessionEntry);
+		struct pe_session *pftSessionEntry,
+		struct pe_session *psessionEntry);
 void lim_ft_prepare_add_bss_req(tpAniSirGlobal mac, uint8_t updateEntry,
-		tpPESession pftSessionEntry,
+		struct pe_session *pftSessionEntry,
 		tpSirBssDescription bssDescription);
 QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx,
-		tpPESession session_entry, tSirFTPreAuthReq *ft_preauth_req);
+		struct pe_session *session_entry, tSirFTPreAuthReq *ft_preauth_req);
 #else
 static inline void lim_fill_ft_session(tpAniSirGlobal mac,
 		tpSirBssDescription pbssDescription,
-		tpPESession pftSessionEntry,
-		tpPESession psessionEntry)
+		struct pe_session *pftSessionEntry,
+		struct pe_session *psessionEntry)
 {}
 static inline void lim_ft_prepare_add_bss_req(tpAniSirGlobal mac,
-		uint8_t updateEntry, tpPESession pftSessionEntry,
+		uint8_t updateEntry, struct pe_session *pftSessionEntry,
 		tpSirBssDescription bssDescription)
 {}
 #endif

+ 10 - 10
core/mac/src/pe/lim/lim_ft.c

@@ -43,12 +43,12 @@ extern void lim_send_set_sta_key_req(tpAniSirGlobal mac,
 				     tLimMlmSetKeysReq * pMlmSetKeysReq,
 				     uint16_t staIdx,
 				     uint8_t defWEPIdx,
-				     tpPESession sessionEntry, bool sendRsp);
+				     struct pe_session *sessionEntry, bool sendRsp);
 
 /*--------------------------------------------------------------------------
    Initialize the FT variables.
    ------------------------------------------------------------------------*/
-void lim_ft_open(tpAniSirGlobal mac, tpPESession psessionEntry)
+void lim_ft_open(tpAniSirGlobal mac, struct pe_session *psessionEntry)
 {
 	if (psessionEntry)
 		qdf_mem_set(&psessionEntry->ftPEContext, sizeof(tftPEContext),
@@ -68,7 +68,7 @@ void lim_ft_cleanup_all_ft_sessions(tpAniSirGlobal mac)
 	}
 }
 
-void lim_ft_cleanup(tpAniSirGlobal mac, tpPESession psessionEntry)
+void lim_ft_cleanup(tpAniSirGlobal mac, struct pe_session *psessionEntry)
 {
 	if (NULL == psessionEntry) {
 		pe_err("psessionEntry is NULL");
@@ -119,7 +119,7 @@ void lim_ft_cleanup(tpAniSirGlobal mac, tpPESession psessionEntry)
  *
  *------------------------------------------------------------------*/
 void lim_ft_prepare_add_bss_req(tpAniSirGlobal mac,
-		uint8_t updateEntry, tpPESession pftSessionEntry,
+		uint8_t updateEntry, struct pe_session *pftSessionEntry,
 		tpSirBssDescription bssDescription)
 {
 	tpAddBssParams pAddBssParams = NULL;
@@ -480,7 +480,7 @@ void lim_ft_prepare_add_bss_req(tpAniSirGlobal mac,
  * Return: none
  */
 static void lim_fill_dot11mode(tpAniSirGlobal mac_ctx,
-			tpPESession pftSessionEntry, tpPESession psessionEntry)
+			struct pe_session *pftSessionEntry, struct pe_session *psessionEntry)
 {
 	uint32_t self_dot11_mode;
 
@@ -506,7 +506,7 @@ static void lim_fill_dot11mode(tpAniSirGlobal mac_ctx,
  * Return: none
  */
 static void lim_fill_dot11mode(tpAniSirGlobal mac_ctx,
-			tpPESession pftSessionEntry, tpPESession psessionEntry)
+			struct pe_session *pftSessionEntry, struct pe_session *psessionEntry)
 {
 	pftSessionEntry->dot11mode =
 			psessionEntry->ftPEContext.pFTPreAuthReq->dot11mode;
@@ -522,7 +522,7 @@ static void lim_fill_dot11mode(tpAniSirGlobal mac_ctx,
  *------------------------------------------------------------------*/
 void lim_fill_ft_session(tpAniSirGlobal mac,
 			 tpSirBssDescription pbssDescription,
-			 tpPESession pftSessionEntry, tpPESession psessionEntry)
+			 struct pe_session *pftSessionEntry, struct pe_session *psessionEntry)
 {
 	uint8_t currentBssUapsd;
 	int8_t localPowerConstraint;
@@ -740,7 +740,7 @@ bool lim_process_ft_update_key(tpAniSirGlobal mac, uint32_t *pMsgBuf)
 {
 	tAddBssParams *pAddBssParams;
 	tSirFTUpdateKeyInfo *pKeyInfo;
-	tpPESession psessionEntry;
+	struct pe_session *psessionEntry;
 	uint8_t sessionId;
 
 	/* Sanity Check */
@@ -865,7 +865,7 @@ void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal mac,
 	uint16_t assocId = 0;
 	tSirMacAddr peerMacAddr;
 	uint8_t rspReqd = 1;
-	tpPESession psessionEntry = NULL;
+	struct pe_session *psessionEntry = NULL;
 	int i = 0;
 
 	pe_debug(" Received AGGR_QOS_RSP from HAL");
@@ -925,7 +925,7 @@ QDF_STATUS lim_process_ft_aggr_qos_req(tpAniSirGlobal mac, uint32_t *pMsgBuf)
 	struct scheduler_msg msg = {0};
 	tSirAggrQosReq *aggrQosReq = (tSirAggrQosReq *) pMsgBuf;
 	tpAggrAddTsParams pAggrAddTsParam;
-	tpPESession psessionEntry = NULL;
+	struct pe_session *psessionEntry = NULL;
 	tpLimTspecInfo tspecInfo;
 	uint8_t ac;
 	tpDphHashNode pSta;

+ 13 - 13
core/mac/src/pe/lim/lim_ft_preauth.c

@@ -45,9 +45,9 @@
  * Return: None
  */
 void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal mac,
-		tpPESession psessionEntry)
+		struct pe_session *psessionEntry)
 {
-	tpPESession pReAssocSessionEntry = NULL;
+	struct pe_session *pReAssocSessionEntry = NULL;
 	uint8_t sessionId = 0;
 
 	if (!psessionEntry) {
@@ -127,7 +127,7 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx,
 				struct scheduler_msg *msg)
 {
 	int buf_consumed = false;
-	tpPESession session;
+	struct pe_session *session;
 	uint8_t session_id;
 	tpSirFTPreAuthReq ft_pre_auth_req = (tSirFTPreAuthReq *) msg->bodyptr;
 
@@ -222,7 +222,7 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx,
  * Return: None
  */
 void lim_perform_ft_pre_auth(tpAniSirGlobal mac, QDF_STATUS status,
-			     uint32_t *data, tpPESession psessionEntry)
+			     uint32_t *data, struct pe_session *psessionEntry)
 {
 	tSirMacAuthFrameBody authFrame;
 	unsigned int session_id;
@@ -314,9 +314,9 @@ preauth_fail:
  * Return: Success or Failure Status
  */
 QDF_STATUS lim_ft_setup_auth_session(tpAniSirGlobal mac,
-					tpPESession psessionEntry)
+					struct pe_session *psessionEntry)
 {
-	tpPESession pftSessionEntry = NULL;
+	struct pe_session *pftSessionEntry = NULL;
 	uint8_t sessionId = 0;
 
 	pftSessionEntry =
@@ -356,7 +356,7 @@ QDF_STATUS lim_ft_setup_auth_session(tpAniSirGlobal mac,
  * Return: None
  */
 static void lim_ft_process_pre_auth_result(tpAniSirGlobal mac,
-					   tpPESession psessionEntry)
+					   struct pe_session *psessionEntry)
 {
 	if (NULL == psessionEntry ||
 	    NULL == psessionEntry->ftPEContext.pFTPreAuthReq)
@@ -398,9 +398,9 @@ static void lim_ft_process_pre_auth_result(tpAniSirGlobal mac,
  */
 void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal mac, QDF_STATUS status,
 				uint8_t *auth_rsp, uint16_t auth_rsp_length,
-				tpPESession psessionEntry)
+				struct pe_session *psessionEntry)
 {
-	tpPESession pftSessionEntry = NULL;
+	struct pe_session *pftSessionEntry = NULL;
 	uint8_t sessionId = 0;
 	tpSirBssDescription pbssDescription = NULL;
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
@@ -514,7 +514,7 @@ send_rsp:
  */
 void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac_ctx)
 {
-	tpPESession session;
+	struct pe_session *session;
 
 	/*
 	 * We have failed pre auth. We need to resume link and get back on
@@ -591,7 +591,7 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx,
 			      QDF_STATUS status,
 			      uint8_t *auth_rsp,
 			      uint16_t auth_rsp_length,
-			      tpPESession session)
+			      struct pe_session *session)
 {
 	tpSirFTPreAuthRsp ft_pre_auth_rsp;
 	struct scheduler_msg mmh_msg = {0};
@@ -667,7 +667,7 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx,
  * Return: Status of sending message to scan module.
  */
 QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx,
-					 tpPESession session_entry,
+					 struct pe_session *session_entry,
 					 tSirFTPreAuthReq *ft_preauth_req)
 {
 	struct scan_start_request *req;
@@ -754,7 +754,7 @@ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx,
 				uint8_t session_id,
 				uint32_t scan_id)
 {
-	tpPESession session_entry;
+	struct pe_session *session_entry;
 
 	session_entry = pe_find_session_by_scan_id(mac_ctx, scan_id);
 	/* Pre-auth request is sent */