Prechádzať zdrojové kódy

qcacld-3.0: Replace isRoamOffloadEnabled and RoamOffloadEnabled

Replace legacy isRoamOffloadEnabled from csr_config with
converged flag lfr3_roaming_offload.
Fix CamelCase issues for roam offload part.

Change-Id: I89ceda876d5549e9b0959e7e25e317c9667594b5
CRs-Fixed: 2367873
Jianmin Zhu 6 rokov pred
rodič
commit
bf84593f36

+ 1 - 1
core/mac/inc/sir_api.h

@@ -2405,7 +2405,7 @@ typedef struct sSirRoamOffloadScanReq {
 	uint8_t RoamBeaconRssiWeight;
 	eSirDFSRoamScanMode allowDFSChannelRoam;
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-	uint8_t RoamOffloadEnabled;
+	uint8_t roam_offload_enabled;
 	uint8_t PSK_PMK[SIR_ROAM_SCAN_PSK_SIZE];
 	uint32_t pmk_len;
 	uint8_t Prefer5GHz;

+ 3 - 2
core/mac/src/pe/lim/lim_ft.c

@@ -480,12 +480,13 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
  * Return: none
  */
 static void lim_fill_dot11mode(struct mac_context *mac_ctx,
-			struct pe_session *ft_session, struct pe_session *pe_session)
+			       struct pe_session *ft_session,
+			       struct pe_session *pe_session)
 {
 	uint32_t self_dot11_mode;
 
 	if (pe_session->ftPEContext.pFTPreAuthReq &&
-			!mac_ctx->roam.configParam.isRoamOffloadEnabled) {
+	    !csr_is_roam_offload_enabled(mac_ctx)) {
 		ft_session->dot11mode =
 			pe_session->ftPEContext.pFTPreAuthReq->dot11mode;
 	} else {

+ 2 - 2
core/sme/inc/csr_api.h

@@ -1109,11 +1109,11 @@ typedef struct tagCsrUpdateConfigParam {
 	tCsr11dinfo Csr11dinfo;
 } tCsrUpdateConfigParam;
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-#define csr_roamIsRoamOffloadEnabled(mac) \
+#define csr_is_roam_offload_enabled(mac) \
 	(mac->mlme_cfg->lfr.lfr3_roaming_offload)
 #define DEFAULT_REASSOC_FAILURE_TIMEOUT 1000
 #else
-#define csr_roamIsRoamOffloadEnabled(mac)  false
+#define csr_is_roam_offload_enabled(mac)  false
 #endif
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD

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

@@ -421,9 +421,6 @@ struct csr_config {
 	uint8_t isCoalesingInIBSSAllowed;
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 	uint8_t cc_switch_mode;
-#endif
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
-	bool isRoamOffloadEnabled;
 #endif
 	bool obssEnabled;
 	uint8_t conc_custom_rule1;

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

@@ -5969,7 +5969,7 @@ QDF_STATUS sme_update_fils_config(mac_handle_t mac_handle, uint8_t session_id,
 	}
 
 	csr_update_fils_config(mac, session_id, src_profile);
-	if (csr_roamIsRoamOffloadEnabled(mac)) {
+	if (csr_is_roam_offload_enabled(mac)) {
 		status = sme_acquire_global_lock(&mac->sme);
 		if (QDF_IS_STATUS_SUCCESS(status)) {
 			sme_debug("Updating fils config to fw");

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

@@ -17811,11 +17811,11 @@ csr_create_roam_scan_offload_request(struct mac_context *mac_ctx,
 		  req_buf->lca_config_params.disallow_duration,
 		  req_buf->lca_config_params.rssi_channel_penalization,
 		  req_buf->lca_config_params.num_disallowed_aps);
-	req_buf->RoamOffloadEnabled = csr_roamIsRoamOffloadEnabled(mac_ctx);
+	req_buf->roam_offload_enabled = csr_is_roam_offload_enabled(mac_ctx);
 	req_buf->RoamKeyMgmtOffloadEnabled = session->RoamKeyMgmtOffloadEnabled;
 	req_buf->pmkid_modes = session->pmkid_modes;
 	/* Roam Offload piggybacks upon the Roam Scan offload command. */
-	if (req_buf->RoamOffloadEnabled)
+	if (req_buf->roam_offload_enabled)
 		csr_update_roam_scan_offload_request(mac_ctx, req_buf, session);
 	qdf_mem_copy(&req_buf->roam_params,
 		&mac_ctx->roam.configParam.roam_params,

+ 3 - 3
core/wma/src/wma_scan_roam.c

@@ -310,7 +310,7 @@ static void wma_roam_scan_offload_set_params(
 				 roam_req->ConnectedNetwork.encryption);
 	WMA_LOGD("%s : auth mode = %d", __func__, params->auth_mode);
 
-	params->roam_offload_enabled = roam_req->RoamOffloadEnabled;
+	params->roam_offload_enabled = roam_req->roam_offload_enabled;
 	params->roam_offload_params.ho_delay_for_rx =
 				roam_req->ho_delay_for_rx;
 	params->roam_offload_params.roam_preauth_retry_count =
@@ -765,7 +765,7 @@ A_UINT32 e_csr_encryption_type_to_rsn_cipherset(eCsrEncryptionType encr)
 static uint32_t wma_roam_scan_get_cckm_mode(tSirRoamOffloadScanReq *roam_req,
 		uint32_t auth_mode)
 {
-	if (roam_req->RoamOffloadEnabled)
+	if (roam_req->roam_offload_enabled)
 		return auth_mode;
 	else
 		return WMI_AUTH_CCKM;
@@ -1615,7 +1615,7 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle,
 			    roam_req->reason == REASON_ROAM_SYNCH_FAILED) {
 				mode = WMI_ROAM_SCAN_MODE_NONE;
 			} else {
-				if (csr_roamIsRoamOffloadEnabled(mac))
+				if (csr_is_roam_offload_enabled(mac))
 					mode = WMI_ROAM_SCAN_MODE_NONE |
 						WMI_ROAM_SCAN_MODE_ROAMOFFLOAD;
 				else