qcacld-3.0: Get rid of camelCase pSapContext

Replace all pSapContext with sap_context

Change-Id: I79e29f4921be0b81b101297d1b976ba711fef0e6
CRs-Fixed: 2230873

core/sap/inc/sap_api.h

@@ -722,7 +722,7 @@ typedef struct sSapDfsInfo {
 
 typedef struct tagSapCtxList {
 	uint8_t sessionID;
-	void *pSapContext;
+	void *sap_context;
 	enum QDF_OPMODE sapPersona;
 } tSapCtxList, tpSapCtxList;
 

core/sap/src/sap_api_link_cntl.c

@@ -317,7 +317,7 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle,
 	* Now do
 	* 1. Get scan results
 	* 2. Run channel selection algorithm
-	* select channel and store in pSapContext->Channel
+	* select channel and store in sap_context->Channel
 	*/
 	scan_get_result_status = sme_scan_get_result(hal_handle,
 					sap_ctx->sessionId,
@@ -660,29 +660,29 @@ wlansap_roam_process_dfs_chansw_update(tHalHandle hHal,
 
 	/* Issue channel change req for each sapctx */
 	for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
-		struct sap_context *pSapContext;
+		struct sap_context *sap_context;
 
 		if (!((QDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona)
-		    && (mac_ctx->sap.sapCtxList[intf].pSapContext != NULL)))
+		    && (mac_ctx->sap.sapCtxList[intf].sap_context != NULL)))
 			continue;
-		pSapContext = mac_ctx->sap.sapCtxList[intf].pSapContext;
+		sap_context = mac_ctx->sap.sapCtxList[intf].sap_context;
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 			  FL("sapdfs:issue chnl change for sapctx[%pK]"),
-			  pSapContext);
+			  sap_context);
 		/* Send channel switch request */
 		sap_event.event = eWNI_SME_CHANNEL_CHANGE_REQ;
 		sap_event.params = 0;
 		sap_event.u1 = 0;
 		sap_event.u2 = 0;
 		/* Handle event */
-		qdf_status = sap_fsm(pSapContext, &sap_event);
+		qdf_status = sap_fsm(sap_context, &sap_event);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  FL("post chnl chng req failed, sap[%pK]"),
 				  sap_ctx);
 			*ret_status = QDF_STATUS_E_FAILURE;
 		} else {
-			pSapContext->is_sap_ready_for_chnl_chng = false;
+			sap_context->is_sap_ready_for_chnl_chng = false;
 		}
 	}
 	return;
@@ -871,21 +871,21 @@ static void wlansap_update_vendor_acs_chan(tpAniSirGlobal mac_ctx,
 
 	/* Issue stopbss for each sapctx */
 	for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
-		struct sap_context *pSapContext;
+		struct sap_context *sap_context;
 
 		if (((QDF_SAP_MODE ==
 		    mac_ctx->sap.sapCtxList[intf].sapPersona) ||
 		    (QDF_P2P_GO_MODE ==
 		    mac_ctx->sap.sapCtxList[intf].sapPersona)) &&
-		    mac_ctx->sap.sapCtxList[intf].pSapContext !=
+		    mac_ctx->sap.sapCtxList[intf].sap_context !=
 		    NULL) {
-			pSapContext =
-			    mac_ctx->sap.sapCtxList[intf].pSapContext;
+			sap_context =
+			    mac_ctx->sap.sapCtxList[intf].sap_context;
 			QDF_TRACE(QDF_MODULE_ID_SAP,
 				  QDF_TRACE_LEVEL_ERROR,
 				  FL("sapdfs: no available channel for sapctx[%pK], StopBss"),
-				  pSapContext);
-			wlansap_stop_bss(pSapContext);
+				  sap_context);
+			wlansap_stop_bss(sap_context);
 		}
 	}
 }
@@ -1055,18 +1055,18 @@ wlansap_roam_callback(void *ctx, struct csr_roam_info *csr_roam_info,
 		}
 		/* Issue stopbss for each sapctx */
 		for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
-			struct sap_context *pSapContext;
+			struct sap_context *sap_context;
 			struct csr_roam_profile *profile;
 
 			if (((QDF_SAP_MODE ==
 			    mac_ctx->sap.sapCtxList[intf].sapPersona) ||
 			    (QDF_P2P_GO_MODE ==
 			    mac_ctx->sap.sapCtxList[intf].sapPersona)) &&
-			    mac_ctx->sap.sapCtxList[intf].pSapContext !=
+			    mac_ctx->sap.sapCtxList[intf].sap_context !=
 			    NULL) {
-				pSapContext =
-				    mac_ctx->sap.sapCtxList[intf].pSapContext;
-				profile = &pSapContext->csr_roamProfile;
+				sap_context =
+				    mac_ctx->sap.sapCtxList[intf].sap_context;
+				profile = &sap_context->csr_roamProfile;
 				if (!wlan_reg_is_passive_or_disable_ch(
 						mac_ctx->pdev,
 						profile->operationChannel))
@@ -1074,8 +1074,8 @@ wlansap_roam_callback(void *ctx, struct csr_roam_info *csr_roam_info,
 				QDF_TRACE(QDF_MODULE_ID_SAP,
 					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sapdfs: no available channel for sapctx[%pK], StopBss"),
-					  pSapContext);
-				sap_signal_hdd_event(pSapContext, NULL,
+					  sap_context);
+				sap_signal_hdd_event(sap_context, NULL,
 					eSAP_STOP_BSS_DUE_TO_NO_CHNL,
 					(void *) eSAP_STATUS_SUCCESS);
 			}

core/sap/src/sap_fsm.c

@@ -1169,8 +1169,8 @@ static struct sap_context *sap_find_valid_concurrent_session(tHalHandle hal)
 				mac_ctx->sap.sapCtxList[intf].sapPersona) ||
 		     (QDF_P2P_GO_MODE ==
 				mac_ctx->sap.sapCtxList[intf].sapPersona)) &&
-		    mac_ctx->sap.sapCtxList[intf].pSapContext != NULL) {
-			sap_ctx = mac_ctx->sap.sapCtxList[intf].pSapContext;
+		    mac_ctx->sap.sapCtxList[intf].sap_context != NULL) {
+			sap_ctx = mac_ctx->sap.sapCtxList[intf].sap_context;
 			if (sap_ctx->sapsMachine != eSAP_DISCONNECTED)
 				return sap_ctx;
 		}
@@ -1220,12 +1220,12 @@ QDF_STATUS sap_set_session_param(tHalHandle hal, struct sap_context *sapctx,
 
 	/* When SSR, SAP will restart, clear the old context,sessionId */
 	for (i = 0; i < SAP_MAX_NUM_SESSION; i++) {
-		if (mac_ctx->sap.sapCtxList[i].pSapContext == sapctx)
-			mac_ctx->sap.sapCtxList[i].pSapContext = NULL;
+		if (mac_ctx->sap.sapCtxList[i].sap_context == sapctx)
+			mac_ctx->sap.sapCtxList[i].sap_context = NULL;
 	}
 	mac_ctx->sap.sapCtxList[sapctx->sessionId].sessionID =
 				sapctx->sessionId;
-	mac_ctx->sap.sapCtxList[sapctx->sessionId].pSapContext = sapctx;
+	mac_ctx->sap.sapCtxList[sapctx->sessionId].sap_context = sapctx;
 	mac_ctx->sap.sapCtxList[sapctx->sessionId].sapPersona =
 				sapctx->csr_roamProfile.csrPersona;
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
@@ -1245,7 +1245,7 @@ QDF_STATUS sap_clear_session_param(tHalHandle hal, struct sap_context *sapctx,
 
 	mac_ctx->sap.sapCtxList[sapctx->sessionId].sessionID =
 		CSR_SESSION_ID_INVALID;
-	mac_ctx->sap.sapCtxList[sapctx->sessionId].pSapContext = NULL;
+	mac_ctx->sap.sapCtxList[sapctx->sessionId].sap_context = NULL;
 	mac_ctx->sap.sapCtxList[sapctx->sessionId].sapPersona =
 		QDF_MAX_NO_OF_MODE;
 	sap_clear_global_dfs_param(hal);
@@ -1857,7 +1857,7 @@ static struct sap_context *sap_find_cac_wait_session(tHalHandle handle)
 			"%s", __func__);
 
 	for (i = 0; i < SAP_MAX_NUM_SESSION; i++) {
-		sapContext = mac->sap.sapCtxList[i].pSapContext;
+		sapContext = mac->sap.sapCtxList[i].sap_context;
 		if (((QDF_SAP_MODE == mac->sap.sapCtxList[i].sapPersona)
 		    ||
 		    (QDF_P2P_GO_MODE == mac->sap.sapCtxList[i].sapPersona)) &&
@@ -1897,14 +1897,14 @@ void sap_cac_reset_notify(tHalHandle hHal)
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
-		struct sap_context *pSapContext =
-			pMac->sap.sapCtxList[intf].pSapContext;
+		struct sap_context *sap_context =
+			pMac->sap.sapCtxList[intf].sap_context;
 		if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona)
 		    ||
 		    (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona))
-		    && pMac->sap.sapCtxList[intf].pSapContext != NULL) {
-			pSapContext->isCacStartNotified = false;
-			pSapContext->isCacEndNotified = false;
+		    && pMac->sap.sapCtxList[intf].sap_context != NULL) {
+			sap_context->isCacStartNotified = false;
+			sap_context->isCacEndNotified = false;
 		}
 	}
 }
@@ -1929,25 +1929,25 @@ static QDF_STATUS sap_cac_start_notify(tHalHandle hHal)
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
 
 	for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
-		struct sap_context *pSapContext =
-			pMac->sap.sapCtxList[intf].pSapContext;
+		struct sap_context *sap_context =
+			pMac->sap.sapCtxList[intf].sap_context;
 		struct csr_roam_profile *profile;
 
 		if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona)
 		    ||
 		    (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona))
-		    && pMac->sap.sapCtxList[intf].pSapContext != NULL &&
-		    (false == pSapContext->isCacStartNotified)) {
+		    && pMac->sap.sapCtxList[intf].sap_context != NULL &&
+		    (false == sap_context->isCacStartNotified)) {
 			/* Don't start CAC for non-dfs channel, its violation */
-			profile = &pSapContext->csr_roamProfile;
+			profile = &sap_context->csr_roamProfile;
 			if (!wlan_reg_is_dfs_ch(pMac->pdev,
 						profile->operationChannel))
 				continue;
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 				  "sapdfs: Signaling eSAP_DFS_CAC_START to HDD for sapctx[%pK]",
-				  pSapContext);
+				  sap_context);
 
-			qdf_status = sap_signal_hdd_event(pSapContext, NULL,
+			qdf_status = sap_signal_hdd_event(sap_context, NULL,
 							  eSAP_DFS_CAC_START,
 							  (void *)
 							  eSAP_STATUS_SUCCESS);
@@ -1958,7 +1958,7 @@ static QDF_STATUS sap_cac_start_notify(tHalHandle hHal)
 					  __func__, intf);
 				return qdf_status;
 			}
-			pSapContext->isCacStartNotified = true;
+			sap_context->isCacStartNotified = true;
 		}
 	}
 	return qdf_status;
@@ -2029,19 +2029,19 @@ static QDF_STATUS sap_cac_end_notify(tHalHandle hHal,
 	 * sap_radar_found_status is set to 0
 	 */
 	for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
-		struct sap_context *pSapContext =
-			pMac->sap.sapCtxList[intf].pSapContext;
+		struct sap_context *sap_context =
+			pMac->sap.sapCtxList[intf].sap_context;
 		struct csr_roam_profile *profile;
 
 		if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona)
 		    ||
 		    (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona))
-		    && pMac->sap.sapCtxList[intf].pSapContext != NULL &&
-		    (false == pSapContext->isCacEndNotified) &&
-		    (pSapContext->sapsMachine == eSAP_DFS_CAC_WAIT)) {
-			pSapContext = pMac->sap.sapCtxList[intf].pSapContext;
+		    && pMac->sap.sapCtxList[intf].sap_context != NULL &&
+		    (false == sap_context->isCacEndNotified) &&
+		    (sap_context->sapsMachine == eSAP_DFS_CAC_WAIT)) {
+			sap_context = pMac->sap.sapCtxList[intf].sap_context;
 			/* Don't check CAC for non-dfs channel */
-			profile = &pSapContext->csr_roamProfile;
+			profile = &sap_context->csr_roamProfile;
 			if (!wlan_reg_is_dfs_ch(pMac->pdev,
 						profile->operationChannel))
 				continue;
@@ -2051,9 +2051,9 @@ static QDF_STATUS sap_cac_end_notify(tHalHandle hHal,
 			 * temporary interface created for pre cac and switch
 			 * the original SAP to the pre CAC channel.
 			 */
-			if (pSapContext->is_pre_cac_on) {
+			if (sap_context->is_pre_cac_on) {
 				qdf_status = wlansap_update_pre_cac_end(
-						pSapContext, pMac, intf);
+						sap_context, pMac, intf);
 				if (QDF_IS_STATUS_ERROR(qdf_status))
 					return qdf_status;
 				/* pre CAC is not allowed with any concurrency.
@@ -2062,7 +2062,7 @@ static QDF_STATUS sap_cac_end_notify(tHalHandle hHal,
 				break;
 			}
 
-			qdf_status = sap_signal_hdd_event(pSapContext, NULL,
+			qdf_status = sap_signal_hdd_event(sap_context, NULL,
 							  eSAP_DFS_CAC_END,
 							  (void *)
 							  eSAP_STATUS_SUCCESS);
@@ -2073,27 +2073,27 @@ static QDF_STATUS sap_cac_end_notify(tHalHandle hHal,
 					  __func__, intf);
 				return qdf_status;
 			}
-			pSapContext->isCacEndNotified = true;
+			sap_context->isCacEndNotified = true;
 			pMac->sap.SapDfsInfo.sap_radar_found_status = false;
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 				  "sapdfs: Start beacon request on sapctx[%pK]",
-				  pSapContext);
+				  sap_context);
 
 			/* Start beaconing on the new channel */
-			wlansap_start_beacon_req(pSapContext);
+			wlansap_start_beacon_req(sap_context);
 
 			/* Transition from eSAP_STARTING to eSAP_STARTED
 			 * (both without substates)
 			 */
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 				  "sapdfs: channel[%d] from state %s => %s",
-				  pSapContext->channel, "eSAP_STARTING",
+				  sap_context->channel, "eSAP_STARTING",
 				  "eSAP_STARTED");
 
-			pSapContext->sapsMachine = eSAP_STARTED;
+			sap_context->sapsMachine = eSAP_STARTED;
 
 			/*Action code for transition */
-			qdf_status = sap_signal_hdd_event(pSapContext, roamInfo,
+			qdf_status = sap_signal_hdd_event(sap_context, roamInfo,
 							  eSAP_START_BSS_EVENT,
 							  (void *)
 							  eSAP_STATUS_SUCCESS);
@@ -2394,7 +2394,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(struct sap_context *sap_ctx,
 			struct sap_context *t_sap_ctx;
 			struct csr_roam_profile *profile;
 
-			t_sap_ctx = mac_ctx->sap.sapCtxList[intf].pSapContext;
+			t_sap_ctx = mac_ctx->sap.sapCtxList[intf].sap_context;
 			if (((QDF_SAP_MODE ==
 				 mac_ctx->sap.sapCtxList[intf].sapPersona) ||
 			     (QDF_P2P_GO_MODE ==
@@ -2627,9 +2627,9 @@ static QDF_STATUS sap_fsm_state_started(struct sap_context *sap_ctx,
 				mac_ctx->sap.sapCtxList[intf].sapPersona) ||
 			    (QDF_P2P_GO_MODE ==
 				mac_ctx->sap.sapCtxList[intf].sapPersona)) &&
-			    mac_ctx->sap.sapCtxList[intf].pSapContext != NULL) {
+			    mac_ctx->sap.sapCtxList[intf].sap_context != NULL) {
 				temp_sap_ctx =
-				    mac_ctx->sap.sapCtxList[intf].pSapContext;
+				    mac_ctx->sap.sapCtxList[intf].sap_context;
 				/*
 				 * Radar won't come on non-dfs channel, so
 				 * no need to move them
@@ -3683,7 +3683,7 @@ uint8_t sap_get_total_number_sap_intf(tHalHandle hHal)
 		if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona)
 		    ||
 		    (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona))
-		    && pMac->sap.sapCtxList[intf].pSapContext != NULL) {
+		    && pMac->sap.sapCtxList[intf].sap_context != NULL) {
 			intf_count++;
 		}
 	}
@@ -3706,17 +3706,17 @@ bool is_concurrent_sap_ready_for_channel_change(tHalHandle hHal,
 						struct sap_context *sapContext)
 {
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
-	struct sap_context *pSapContext;
+	struct sap_context *sap_context;
 	uint8_t intf = 0;
 
 	for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
 		if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona)
 		    ||
 		    (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona))
-		    && pMac->sap.sapCtxList[intf].pSapContext != NULL) {
-			pSapContext =
-				pMac->sap.sapCtxList[intf].pSapContext;
-			if (pSapContext == sapContext) {
+		    && pMac->sap.sapCtxList[intf].sap_context != NULL) {
+			sap_context =
+				pMac->sap.sapCtxList[intf].sap_context;
+			if (sap_context == sapContext) {
 				QDF_TRACE(QDF_MODULE_ID_SAP,
 					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sapCtx matched [%pK]"),
@@ -3727,8 +3727,8 @@ bool is_concurrent_sap_ready_for_channel_change(tHalHandle hHal,
 					  QDF_TRACE_LEVEL_ERROR,
 					  FL
 						  ("concurrent sapCtx[%pK] didn't matche with [%pK]"),
-					  pSapContext, sapContext);
-				return pSapContext->is_sap_ready_for_chnl_chng;
+					  sap_context, sapContext);
+				return sap_context->is_sap_ready_for_chnl_chng;
 			}
 		}
 	}
@@ -3768,9 +3768,9 @@ bool sap_is_conc_sap_doing_scc_dfs(tHalHandle hal,
 		if ((QDF_SAP_MODE != mac->sap.sapCtxList[intf].sapPersona) &&
 		    (QDF_P2P_GO_MODE != mac->sap.sapCtxList[intf].sapPersona))
 			continue;
-		if (!mac->sap.sapCtxList[intf].pSapContext)
+		if (!mac->sap.sapCtxList[intf].sap_context)
 			continue;
-		sap_ctx = mac->sap.sapCtxList[intf].pSapContext;
+		sap_ctx = mac->sap.sapCtxList[intf].sap_context;
 		/* if same SAP contexts then skip to next context */
 		if (sap_ctx == given_sapctx)
 			continue;

core/sap/src/sap_module.c

@@ -720,7 +720,7 @@ QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
 	pmac->sap.SapDfsInfo.sap_ch_switch_mode =
 			pConfig->sap_chanswitch_mode;
 
-	pmac->sap.sapCtxList[sap_ctx->sessionId].pSapContext = sap_ctx;
+	pmac->sap.sapCtxList[sap_ctx->sessionId].sap_context = sap_ctx;
 	pmac->sap.sapCtxList[sap_ctx->sessionId].sapPersona =
 		sap_ctx->csr_roamProfile.csrPersona;
 	pmac->sap.sapCtxList[sap_ctx->sessionId].sessionID =
@@ -1580,7 +1580,7 @@ bool wlan_sap_is_pre_cac_active(tHalHandle handle)
 
 	for (i = 0; i < SAP_MAX_NUM_SESSION; i++) {
 		struct sap_context *context =
-			mac->sap.sapCtxList[i].pSapContext;
+			mac->sap.sapCtxList[i].sap_context;
 		if (context && context->is_pre_cac_on)
 			return true;
 	}
@@ -1610,7 +1610,7 @@ QDF_STATUS wlan_sap_get_pre_cac_vdev_id(tHalHandle handle, uint8_t *vdev_id)
 
 	for (i = 0; i < SAP_MAX_NUM_SESSION; i++) {
 		struct sap_context *context =
-			mac->sap.sapCtxList[i].pSapContext;
+			mac->sap.sapCtxList[i].sap_context;
 		if (context && context->is_pre_cac_on) {
 			*vdev_id = i;
 			return QDF_STATUS_SUCCESS;