Просмотр исходного кода

qcacld-3.0: Remove redundant fast_roam_enabled flag from CSR session

'fast_roam_enabled' flag does same as 'do_not_roam' flag which is used to
track whether roaming is enabled or disabled per CSR session.
As per code 'do_not_rome' flag alone is sufficient to track roaming status
per session.

Fix to remove redundant 'fast_roam_enabled' flag to allow vendor roaming.

Change-Id: Id7f6e547b883c932f615cfbf89eeb30d47d6408e
CRs-Fixed: 1105973
Sreelakshmi Konamki 8 лет назад
Родитель
Сommit
6b1f5513cf

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

@@ -971,7 +971,6 @@ typedef struct tagCsrRoamSession {
 	bool dhcp_done;
 	uint8_t disconnect_reason;
 	uint8_t uapsd_mask;
-	bool fast_roam_enabled;
 } tCsrRoamSession;
 
 typedef struct tagCsrRoamStruct {

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

@@ -17577,9 +17577,8 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 	}
 
 	if ((ROAM_SCAN_OFFLOAD_START == command) &&
-	    ((session->pCurRoamProfile &&
-	      session->pCurRoamProfile->do_not_roam) ||
-	      !session->fast_roam_enabled)) {
+	    (session->pCurRoamProfile &&
+	      session->pCurRoamProfile->do_not_roam)) {
 		sms_log(mac_ctx, LOGE,
 			FL("Supplicant disabled driver roaming"));
 		return QDF_STATUS_E_FAILURE;

+ 0 - 2
core/sme/src/csr/csr_neighbor_roam.c

@@ -148,7 +148,6 @@ QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal mac_ctx,
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 	tpCsrNeighborRoamControlInfo neighbor_roam_info =
 		&mac_ctx->roam.neighborRoamInfo[session_id];
-	tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id);
 
 	switch (neighbor_roam_info->neighborRoamState) {
 	case eCSR_NEIGHBOR_ROAM_STATE_CONNECTED:
@@ -176,7 +175,6 @@ QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal mac_ctx,
 		qdf_status = QDF_STATUS_E_FAILURE;
 		break;
 	}
-	session->fast_roam_enabled = fast_roam_enabled;
 	return qdf_status;
 }
 QDF_STATUS csr_neighbor_roam_update_config(tpAniSirGlobal mac_ctx,