Browse Source

qcacld-3.0: Replace tpPESession in sch_api

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

Change-Id: I416e6d8d72bc54e5a2e5754a51c35c70ec77a47d
CRs-Fixed: 2354268
Jeff Johnson 6 years ago
parent
commit
0d6c3c8077

+ 11 - 11
core/mac/src/pe/include/sch_api.h

@@ -36,21 +36,21 @@
 
 /* update only the broadcast qos params */
 void sch_qos_update_broadcast(tpAniSirGlobal mac,
-			      tpPESession psessionEntry);
+			      struct pe_session *psessionEntry);
 
 /* fill in the default local edca parameter into gLimEdcaParams[] */
-void sch_set_default_edca_params(tpAniSirGlobal mac, tpPESession psessionE);
+void sch_set_default_edca_params(tpAniSirGlobal mac, struct pe_session *psessionE);
 
 /* update only local qos params */
-void sch_qos_update_local(tpAniSirGlobal mac, tpPESession psessionEntry);
+void sch_qos_update_local(tpAniSirGlobal mac, struct pe_session *psessionEntry);
 
 /* update the edca profile parameters */
 void sch_edca_profile_update(tpAniSirGlobal mac,
-			     tpPESession psessionEntry);
+			     struct pe_session *psessionEntry);
 
 /* / Set the fixed fields in a beacon frame */
 QDF_STATUS sch_set_fixed_beacon_fields(tpAniSirGlobal mac,
-				       tpPESession psessionEntry);
+				       struct pe_session *psessionEntry);
 
 /* / Process the scheduler messages */
 void sch_process_message(tpAniSirGlobal mac,
@@ -73,15 +73,15 @@ QDF_STATUS sch_post_message(tpAniSirGlobal mac,
 			    struct scheduler_msg *pMsg);
 
 void sch_beacon_process(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
-			tpPESession psessionEntry);
+			struct pe_session *psessionEntry);
 
 QDF_STATUS sch_beacon_edca_process(tpAniSirGlobal mac,
 				   tSirMacEdcaParamSetIE *edca,
-				   tpPESession psessionEntry);
+				   struct pe_session *psessionEntry);
 
 void sch_generate_tim(tpAniSirGlobal, uint8_t **, uint16_t *, uint8_t);
 
-void sch_set_beacon_interval(tpAniSirGlobal mac, tpPESession psessionEntry);
+void sch_set_beacon_interval(tpAniSirGlobal mac, struct pe_session *psessionEntry);
 
 /**
  * sch_send_beacon_req() - send beacon update req to wma
@@ -94,13 +94,13 @@ void sch_set_beacon_interval(tpAniSirGlobal mac, tpPESession psessionEntry);
  * return: success: QDF_STATUS_SUCCESS failure: QDF_STATUS_E_FAILURE
  */
 QDF_STATUS sch_send_beacon_req(tpAniSirGlobal mac_ctx, uint8_t *bcn_payload,
-			       uint16_t size, tpPESession session,
+			       uint16_t size, struct pe_session *session,
 			       enum sir_bcn_update_reason reason);
 
 
 QDF_STATUS lim_update_probe_rsp_template_ie_bitmap_beacon1(tpAniSirGlobal,
 							   tDot11fBeacon1 *,
-							   tpPESession
+							   struct pe_session *
 							   psessionEntry);
 void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal,
 						     tDot11fBeacon2 *,
@@ -108,7 +108,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal,
 						     tDot11fProbeResponse *);
 void set_probe_rsp_ie_bitmap(uint32_t *, uint32_t);
 uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal,
-					    tpPESession,
+					    struct pe_session *,
 					    uint32_t *);
 
 int sch_gen_timing_advert_frame(tpAniSirGlobal mac, tSirMacAddr self_addr,

+ 3 - 3
core/mac/src/pe/sch/sch_api.c

@@ -77,7 +77,7 @@ QDF_STATUS sch_post_message(tpAniSirGlobal mac, struct scheduler_msg *pMsg)
 }
 
 QDF_STATUS sch_send_beacon_req(tpAniSirGlobal mac, uint8_t *beaconPayload,
-			       uint16_t size, tpPESession psessionEntry,
+			       uint16_t size, struct pe_session *psessionEntry,
 			       enum sir_bcn_update_reason reason)
 {
 	struct scheduler_msg msgQ = {0};
@@ -184,7 +184,7 @@ QDF_STATUS sch_send_beacon_req(tpAniSirGlobal mac, uint8_t *beaconPayload,
 }
 
 static uint32_t lim_remove_p2p_ie_from_add_ie(tpAniSirGlobal mac,
-					      tpPESession psessionEntry,
+					      struct pe_session *psessionEntry,
 					      uint8_t *addIeWoP2pIe,
 					      uint32_t *addnIELenWoP2pIe)
 {
@@ -224,7 +224,7 @@ static uint32_t lim_remove_p2p_ie_from_add_ie(tpAniSirGlobal mac,
 }
 
 uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal mac,
-					    tpPESession psessionEntry,
+					    struct pe_session *psessionEntry,
 					    uint32_t *IeBitmap)
 {
 	struct scheduler_msg msgQ = {0};

+ 5 - 5
core/mac/src/pe/sch/sch_beacon_gen.c

@@ -98,7 +98,7 @@ static QDF_STATUS sch_get_p2p_ie_offset(uint8_t *pextra_ie,
  * Return: status of operation
  */
 static QDF_STATUS
-sch_append_addn_ie(tpAniSirGlobal mac_ctx, tpPESession session,
+sch_append_addn_ie(tpAniSirGlobal mac_ctx, struct pe_session *session,
 		   uint8_t *frm, uint32_t max_bcn_size, uint32_t *num_bytes,
 		   uint8_t *addn_ie, uint16_t addn_ielen)
 {
@@ -222,7 +222,7 @@ static void sch_get_csa_ecsa_count_offset(uint8_t *ie, uint32_t ie_len,
  */
 
 QDF_STATUS
-sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session)
+sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, struct pe_session *session)
 {
 	tpAniBeaconStruct bcn_struct = (tpAniBeaconStruct)
 						session->pSchBeaconFrameBegin;
@@ -650,7 +650,7 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session)
 QDF_STATUS
 lim_update_probe_rsp_template_ie_bitmap_beacon1(tpAniSirGlobal mac,
 						tDot11fBeacon1 *beacon1,
-						tpPESession psessionEntry)
+						struct pe_session *psessionEntry)
 {
 	uint32_t *DefProbeRspIeBitmap;
 	tDot11fProbeResponse *prb_rsp;
@@ -901,7 +901,7 @@ void set_probe_rsp_ie_bitmap(uint32_t *IeBitmap, uint32_t pos)
  */
 static QDF_STATUS write_beacon_to_memory(tpAniSirGlobal mac, uint16_t size,
 					 uint16_t length,
-					 tpPESession psessionEntry,
+					 struct pe_session *psessionEntry,
 					 enum sir_bcn_update_reason reason)
 {
 	uint16_t i;
@@ -1002,7 +1002,7 @@ QDF_STATUS sch_process_pre_beacon_ind(tpAniSirGlobal mac,
 {
 	tpBeaconGenParams pMsg = (tpBeaconGenParams) limMsg->bodyptr;
 	uint32_t beaconSize;
-	tpPESession psessionEntry;
+	struct pe_session *psessionEntry;
 	uint8_t sessionId;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 

+ 23 - 23
core/mac/src/pe/sch/sch_beacon_process.c

@@ -60,7 +60,7 @@
 static void
 ap_beacon_process_5_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 			tpSchBeaconStruct bcn_struct,
-			tpUpdateBeaconParams bcn_prm, tpPESession session,
+			tpUpdateBeaconParams bcn_prm, struct pe_session *session,
 			uint32_t phy_mode)
 {
 	tpSirMacMgmtHdr mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
@@ -103,7 +103,7 @@ ap_beacon_process_5_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 static void
 ap_beacon_process_24_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 			 tpSchBeaconStruct bcn_struct,
-			 tpUpdateBeaconParams bcn_prm, tpPESession session,
+			 tpUpdateBeaconParams bcn_prm, struct pe_session *session,
 			 uint32_t phy_mode)
 {
 	tpSirMacMgmtHdr mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
@@ -229,7 +229,7 @@ ap_beacon_process_24_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 static void
 ap_beacon_process(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 		  tpSchBeaconStruct bcn_struct,
-		  tpUpdateBeaconParams bcn_prm, tpPESession session)
+		  tpUpdateBeaconParams bcn_prm, struct pe_session *session)
 {
 	uint32_t phy_mode;
 	enum band_info rf_band = BAND_UNKNOWN;
@@ -284,7 +284,7 @@ static void __sch_beacon_process_no_session(tpAniSirGlobal mac,
 					    tpSchBeaconStruct pBeacon,
 					    uint8_t *pRxPacketInfo)
 {
-	tpPESession psessionEntry = NULL;
+	struct pe_session *psessionEntry = NULL;
 
 	psessionEntry = lim_is_ibss_session_active(mac);
 	if (psessionEntry != NULL) {
@@ -345,7 +345,7 @@ static bool
 sch_bcn_process_sta(tpAniSirGlobal mac_ctx,
 			       tpSchBeaconStruct bcn,
 			       uint8_t *rx_pkt_info,
-			       tpPESession session, uint8_t *bssIdx,
+			       struct pe_session *session, uint8_t *bssIdx,
 			       tUpdateBeaconParams *beaconParams,
 			       uint8_t *sendProbeReq, tpSirMacMgmtHdr pMh)
 {
@@ -471,7 +471,7 @@ sch_bcn_process_sta(tpAniSirGlobal mac_ctx,
  * @mac_ctx: pointer to Global Mac structure
  * @sta_ds: pointer to tpDphHashNode
  * @beacon: pointer to tpSchBeaconStruct
- * @session_entry: pointer to tpPESession
+ * @session_entry: pointer to struct pe_session *
  * @mgmt_hdr: pointer to tpSirMacMgmtHdr
  *
  * function to update NSS
@@ -479,7 +479,7 @@ sch_bcn_process_sta(tpAniSirGlobal mac_ctx,
  * Return: none
  */
 static void update_nss(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
-		       tpSchBeaconStruct beacon, tpPESession session_entry,
+		       tpSchBeaconStruct beacon, struct pe_session *session_entry,
 		       tpSirMacMgmtHdr mgmt_hdr)
 {
 	if (sta_ds->vhtSupportedRxNss != (beacon->OperatingMode.rxNSS + 1)) {
@@ -498,7 +498,7 @@ static void update_nss(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
 #ifdef WLAN_FEATURE_11AX_BSS_COLOR
 static void
 sch_bcn_update_he_ies(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
-				tpPESession session, tpSchBeaconStruct bcn,
+				struct pe_session *session, tpSchBeaconStruct bcn,
 				tpSirMacMgmtHdr mac_hdr)
 {
 	uint8_t session_bss_col_disabled_flag;
@@ -535,7 +535,7 @@ sch_bcn_update_he_ies(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
 #else
 static void
 sch_bcn_update_he_ies(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
-				tpPESession session, tpSchBeaconStruct bcn,
+				struct pe_session *session, tpSchBeaconStruct bcn,
 				tpSirMacMgmtHdr mac_hdr)
 {
 	return;
@@ -544,7 +544,7 @@ sch_bcn_update_he_ies(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
 
 static void
 sch_bcn_update_opmode_change(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
-				tpPESession session, tpSchBeaconStruct bcn,
+				struct pe_session *session, tpSchBeaconStruct bcn,
 				tpSirMacMgmtHdr mac_hdr, uint8_t cb_mode)
 {
 	bool skip_opmode_update = false;
@@ -709,7 +709,7 @@ static void
 sch_bcn_process_sta_ibss(tpAniSirGlobal mac_ctx,
 				    tpSchBeaconStruct bcn,
 				    uint8_t *rx_pkt_info,
-				    tpPESession session, uint8_t *bssIdx,
+				    struct pe_session *session, uint8_t *bssIdx,
 				    tUpdateBeaconParams *beaconParams,
 				    uint8_t *sendProbeReq, tpSirMacMgmtHdr pMh)
 {
@@ -804,7 +804,7 @@ static void get_local_power_constraint_beacon(
 static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
 					     tpSchBeaconStruct bcn,
 					     uint8_t *rx_pkt_info,
-					     tpPESession session)
+					     struct pe_session *session)
 {
 	uint8_t bssIdx = 0;
 	tUpdateBeaconParams beaconParams;
@@ -931,7 +931,7 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
 
 #ifdef WLAN_FEATURE_11AX_BSS_COLOR
 static void ap_update_bss_color_info(tpAniSirGlobal mac_ctx,
-						tpPESession session,
+						struct pe_session *session,
 						uint8_t bss_color)
 {
 	if (!session)
@@ -947,7 +947,7 @@ static void ap_update_bss_color_info(tpAniSirGlobal mac_ctx,
 					qdf_get_system_timestamp();
 }
 
-static uint8_t ap_get_new_bss_color(tpAniSirGlobal mac_ctx, tpPESession session)
+static uint8_t ap_get_new_bss_color(tpAniSirGlobal mac_ctx, struct pe_session *session)
 {
 	int i;
 	uint8_t new_bss_color;
@@ -979,7 +979,7 @@ static uint8_t ap_get_new_bss_color(tpAniSirGlobal mac_ctx, tpPESession session)
 }
 
 static void sch_check_bss_color_ie(tpAniSirGlobal mac_ctx,
-					tpPESession ap_session,
+					struct pe_session *ap_session,
 					tSchBeaconStruct *bcn,
 					tUpdateBeaconParams *bcn_prm)
 {
@@ -1014,7 +1014,7 @@ static void sch_check_bss_color_ie(tpAniSirGlobal mac_ctx,
 
 #else
 static void  sch_check_bss_color_ie(tpAniSirGlobal mac_ctx,
-					tpPESession ap_session,
+					struct pe_session *ap_session,
 					tSchBeaconStruct *bcn,
 					tUpdateBeaconParams *bcn_prm)
 {
@@ -1026,7 +1026,7 @@ void sch_beacon_process_for_ap(tpAniSirGlobal mac_ctx,
 				uint8_t *rx_pkt_info,
 				tSchBeaconStruct *bcn)
 {
-	tpPESession ap_session;
+	struct pe_session *ap_session;
 	tUpdateBeaconParams bcn_prm;
 
 	if (!bcn || !rx_pkt_info) {
@@ -1079,7 +1079,7 @@ void sch_beacon_process_for_ap(tpAniSirGlobal mac_ctx,
  */
 void
 sch_beacon_process(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
-		   tpPESession session)
+		   struct pe_session *session)
 {
 	static tSchBeaconStruct bcn;
 
@@ -1113,7 +1113,7 @@ sch_beacon_process(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
  */
 QDF_STATUS
 sch_beacon_edca_process(tpAniSirGlobal mac, tSirMacEdcaParamSetIE *edca,
-			tpPESession session)
+			struct pe_session *session)
 {
 	uint8_t i;
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
@@ -1210,7 +1210,7 @@ sch_beacon_edca_process(tpAniSirGlobal mac, tSirMacEdcaParamSetIE *edca,
 }
 
 void lim_enable_obss_detection_config(tpAniSirGlobal mac_ctx,
-				      tpPESession session)
+				      struct pe_session *session)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
@@ -1255,7 +1255,7 @@ void lim_enable_obss_detection_config(tpAniSirGlobal mac_ctx,
 }
 
 QDF_STATUS lim_obss_generate_detection_config(tpAniSirGlobal mac_ctx,
-					      tpPESession session,
+					      struct pe_session *session,
 					      struct obss_detection_cfg *cfg)
 {
 	uint32_t phy_mode;
@@ -1402,7 +1402,7 @@ QDF_STATUS lim_obss_generate_detection_config(tpAniSirGlobal mac_ctx,
 }
 
 QDF_STATUS lim_obss_send_detection_cfg(tpAniSirGlobal mac_ctx,
-				       tpPESession session, bool force)
+				       struct pe_session *session, bool force)
 {
 	QDF_STATUS status;
 	struct obss_detection_cfg obss_cfg;
@@ -1489,7 +1489,7 @@ QDF_STATUS lim_process_obss_detection_ind(tpAniSirGlobal mac_ctx,
 	uint32_t reason;
 	struct obss_detection_cfg *obss_cfg;
 	bool enable;
-	tpPESession session;
+	struct pe_session *session;
 	tUpdateBeaconParams bcn_prm;
 	enum band_info rf_band = BAND_UNKNOWN;
 	struct obss_detection_cfg *cur_detect;

+ 10 - 10
core/mac/src/pe/sch/sch_message.c

@@ -44,7 +44,7 @@ get_wmm_local_params(tpAniSirGlobal mac,
 static void
 set_sch_edca_params(tpAniSirGlobal mac,
 		    uint32_t params[][CFG_EDCA_DATA_LEN],
-		    tpPESession psessionEntry);
+		    struct pe_session *psessionEntry);
 
 /* -------------------------------------------------------------------- */
 /**
@@ -62,7 +62,7 @@ set_sch_edca_params(tpAniSirGlobal mac,
  * @return None
  */
 
-void sch_set_beacon_interval(tpAniSirGlobal mac, tpPESession psessionEntry)
+void sch_set_beacon_interval(tpAniSirGlobal mac, struct pe_session *psessionEntry)
 {
 	uint32_t bi;
 
@@ -80,7 +80,7 @@ void sch_set_beacon_interval(tpAniSirGlobal mac, tpPESession psessionEntry)
 static void sch_edca_profile_update_all(tpAniSirGlobal pmac)
 {
 	uint32_t i;
-	tpPESession psession_entry;
+	struct pe_session *psession_entry;
 
 	for (i = 0; i < pmac->lim.maxBssId; i++) {
 		psession_entry = &pmac->lim.gpSession[i];
@@ -236,10 +236,10 @@ sch_get_params(tpAniSirGlobal mac,
  */
 static bool
 broadcast_wmm_of_concurrent_sta_session(tpAniSirGlobal mac_ctx,
-					tpPESession session)
+					struct pe_session *session)
 {
 	uint8_t i, j;
-	tpPESession concurrent_session = NULL;
+	struct pe_session *concurrent_session = NULL;
 
 	for (i = 0; i < mac_ctx->lim.maxBssId; i++) {
 		/*
@@ -293,7 +293,7 @@ broadcast_wmm_of_concurrent_sta_session(tpAniSirGlobal mac_ctx,
 	return true;
 }
 
-void sch_qos_update_broadcast(tpAniSirGlobal mac, tpPESession psessionEntry)
+void sch_qos_update_broadcast(tpAniSirGlobal mac, struct pe_session *psessionEntry)
 {
 	uint32_t params[4][CFG_EDCA_DATA_LEN];
 	uint32_t cwminidx, cwmaxidx, txopidx;
@@ -381,7 +381,7 @@ void sch_qos_update_broadcast(tpAniSirGlobal mac, tpPESession psessionEntry)
 		pe_err("Unable to set beacon fields!");
 }
 
-void sch_qos_update_local(tpAniSirGlobal mac, tpPESession psessionEntry)
+void sch_qos_update_local(tpAniSirGlobal mac, struct pe_session *psessionEntry)
 {
 
 	uint32_t params[4][CFG_EDCA_DATA_LEN];
@@ -408,7 +408,7 @@ void sch_qos_update_local(tpAniSirGlobal mac, tpPESession psessionEntry)
  *
  * return none
  */
-void sch_set_default_edca_params(tpAniSirGlobal mac, tpPESession psessionEntry)
+void sch_set_default_edca_params(tpAniSirGlobal mac, struct pe_session *psessionEntry)
 {
 	uint32_t params[4][CFG_EDCA_DATA_LEN];
 
@@ -433,7 +433,7 @@ void sch_set_default_edca_params(tpAniSirGlobal mac, tpPESession psessionEntry)
 static void
 set_sch_edca_params(tpAniSirGlobal mac,
 		    uint32_t params[][CFG_EDCA_DATA_LEN],
-		    tpPESession psessionEntry)
+		    struct pe_session *psessionEntry)
 {
 	uint32_t i;
 	uint32_t cwminidx, cwmaxidx, txopidx;
@@ -531,7 +531,7 @@ get_wmm_local_params(tpAniSirGlobal mac_ctx,
  *
  * Return  none
  */
-void sch_edca_profile_update(tpAniSirGlobal mac, tpPESession psessionEntry)
+void sch_edca_profile_update(tpAniSirGlobal mac, struct pe_session *psessionEntry)
 {
 	if (LIM_IS_AP_ROLE(psessionEntry) ||
 	    LIM_IS_IBSS_ROLE(psessionEntry)) {