Browse Source

qcacld-3.0: Remove camelcase in csr_roamstart_bssparams struct

Remove the usage camelcase in bssparams structure, use the
snake case instead.

Change-Id: I56a99b69b08db62aef842e40ad358b3d3dc15b40
CRs-Fixed: 3148876
Surya Prakash Sivaraj 3 years ago
parent
commit
93aac5b7c6
3 changed files with 24 additions and 24 deletions
  1. 3 3
      core/sme/inc/csr_internal.h
  2. 12 12
      core/sme/src/common/sme_api.c
  3. 9 9
      core/sme/src/csr/csr_api_roam.c

+ 3 - 3
core/sme/inc/csr_internal.h

@@ -135,7 +135,7 @@ struct csr_roamstart_bssparams {
 	tSirMacSSid ssId;
 
 	tSirNwType sirNwType;
-	ePhyChanBondState cbMode;
+	ePhyChanBondState cb_mode;
 	tSirMacRateSet operationalRateSet;
 	tSirMacRateSet extendedRateSet;
 	uint32_t operation_chan_freq;
@@ -143,14 +143,14 @@ struct csr_roamstart_bssparams {
 	enum csr_cfgdot11mode uCfgDot11Mode;
 	uint8_t privacy;
 	tAniAuthType authType;
-	uint16_t beaconInterval; /* If this is 0, SME'll fill in for caller */
+	uint16_t bcn_int; /* If this is 0, SME'll fill in for caller */
 	uint32_t dtimPeriod;
 	uint8_t ssidHidden;
 	uint8_t wps_state;
 	uint16_t nRSNIELength;  /* If 0, pRSNIE is ignored. */
 	uint8_t *pRSNIE;        /* If not null, it has IE byte stream for RSN */
 	/* Flag used to indicate update beaconInterval */
-	bool updatebeaconInterval;
+	bool update_bcn_int;
 	struct add_ie_params add_ie_params;
 	uint16_t beacon_tx_rate;
 	uint32_t cac_duration_ms;

+ 12 - 12
core/sme/src/common/sme_api.c

@@ -7823,7 +7823,7 @@ QDF_STATUS sme_set_ht2040_mode(mac_handle_t mac_handle, uint8_t sessionId,
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	struct mac_context *mac = MAC_CONTEXT(mac_handle);
-	ePhyChanBondState cbMode;
+	ePhyChanBondState cb_mode;
 	struct csr_roam_session *session = CSR_GET_SESSION(mac, sessionId);
 
 	if (!CSR_IS_SESSION_VALID(mac, sessionId)) {
@@ -7832,33 +7832,33 @@ QDF_STATUS sme_set_ht2040_mode(mac_handle_t mac_handle, uint8_t sessionId,
 	}
 	session = CSR_GET_SESSION(mac, sessionId);
 	sme_debug("Update HT operation beacon IE, channel_type=%d cur cbmode %d",
-		channel_type, session->bssParams.cbMode);
+		channel_type, session->bssParams.cb_mode);
 
 	switch (channel_type) {
 	case eHT_CHAN_HT20:
-		if (!session->bssParams.cbMode)
+		if (!session->bssParams.cb_mode)
 			return QDF_STATUS_SUCCESS;
-		cbMode = PHY_SINGLE_CHANNEL_CENTERED;
+		cb_mode = PHY_SINGLE_CHANNEL_CENTERED;
 		break;
 	case eHT_CHAN_HT40MINUS:
-		if (session->bssParams.cbMode)
+		if (session->bssParams.cb_mode)
 			return QDF_STATUS_SUCCESS;
-		cbMode = PHY_DOUBLE_CHANNEL_HIGH_PRIMARY;
+		cb_mode = PHY_DOUBLE_CHANNEL_HIGH_PRIMARY;
 		break;
 	case eHT_CHAN_HT40PLUS:
-		if (session->bssParams.cbMode)
+		if (session->bssParams.cb_mode)
 			return QDF_STATUS_SUCCESS;
-		cbMode = PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
+		cb_mode = PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
 		break;
 	default:
 		sme_err("Error!!! Invalid HT20/40 mode !");
 		return QDF_STATUS_E_FAILURE;
 	}
-	session->bssParams.cbMode = cbMode;
+	session->bssParams.cb_mode = cb_mode;
 	status = sme_acquire_global_lock(&mac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		status = csr_set_ht2040_mode(mac, sessionId,
-					     cbMode, obssEnabled);
+					     cb_mode, obssEnabled);
 		sme_release_global_lock(&mac->sme);
 	}
 	return status;
@@ -7876,9 +7876,9 @@ QDF_STATUS sme_get_ht2040_mode(mac_handle_t mac_handle, uint8_t vdev_id,
 	}
 	session = CSR_GET_SESSION(mac, vdev_id);
 	sme_debug("Get HT operation beacon IE, channel_type=%d cur cbmode %d",
-		  *channel_type, session->bssParams.cbMode);
+		  *channel_type, session->bssParams.cb_mode);
 
-	switch (session->bssParams.cbMode) {
+	switch (session->bssParams.cb_mode) {
 	case PHY_SINGLE_CHANNEL_CENTERED:
 		*channel_type = eHT_CHAN_HT20;
 		break;

+ 9 - 9
core/sme/src/csr/csr_api_roam.c

@@ -5978,7 +5978,7 @@ QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId,
 
 	pParam->privacy = pProfile->privacy;
 	pParam->authType = pProfile->csr80211AuthType;
-	pParam->beaconInterval = pProfile->beaconInterval;
+	pParam->bcn_int = pProfile->beaconInterval;
 	pParam->dtimPeriod = pProfile->dtimPeriod;
 	pParam->ssidHidden = pProfile->SSIDs.SSIDList[0].ssidHidden;
 	if (CSR_IS_INFRA_AP(pProfile) && (pParam->operation_chan_freq != 0)) {
@@ -6052,7 +6052,7 @@ void csr_roam_prepare_bss_params(struct mac_context *mac, uint32_t sessionId,
 			else
 				cbMode = mac->roam.configParam.channelBondingMode5GHz;
 			sme_debug("## cbMode %d", cbMode);
-			pSession->bssParams.cbMode = cbMode;
+			pSession->bssParams.cb_mode = cbMode;
 		}
 	}
 
@@ -7089,10 +7089,10 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(struct mac_context *mac,
 	/* NO need to update the Beacon Params if update beacon parameter flag
 	 * is not set
 	 */
-	if (!mac->roam.roamSession[sessionId].bssParams.updatebeaconInterval)
+	if (!mac->roam.roamSession[sessionId].bssParams.update_bcn_int)
 		return QDF_STATUS_SUCCESS;
 
-	mac->roam.roamSession[sessionId].bssParams.updatebeaconInterval =
+	mac->roam.roamSession[sessionId].bssParams.update_bcn_int =
 		false;
 
 	/* Create the message and send to lim */
@@ -7115,9 +7115,9 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(struct mac_context *mac,
 		sme_debug("session %d BeaconInterval %d",
 			sessionId,
 			mac->roam.roamSession[sessionId].bssParams.
-			beaconInterval);
+			bcn_int);
 		pMsg->beacon_interval =
-			mac->roam.roamSession[sessionId].bssParams.beaconInterval;
+			mac->roam.roamSession[sessionId].bssParams.bcn_int;
 		status = umac_send_mb_message_to_mac(pMsg);
 	}
 	return status;
@@ -7342,8 +7342,8 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t
 	pMsg->messageType = eWNI_SME_START_BSS_REQ;
 	pMsg->vdev_id = sessionId;
 	pMsg->length = sizeof(*pMsg);
-	if (pParam->beaconInterval)
-		candidate_info.beacon_interval = pParam->beaconInterval;
+	if (pParam->bcn_int)
+		candidate_info.beacon_interval = pParam->bcn_int;
 	else
 		candidate_info.beacon_interval = MLME_CFG_BEACON_INTERVAL_DEF;
 
@@ -7352,7 +7352,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t
 					&candidate_info);
 
 	/* Update the beacon Interval */
-	pParam->beaconInterval = candidate_info.beacon_interval;
+	pParam->bcn_int = candidate_info.beacon_interval;
 	pMsg->beaconInterval = candidate_info.beacon_interval;
 	pMsg->dot11mode =
 		csr_translate_to_wni_cfg_dot11_mode(mac,