From 6b1f5513cff87213b7b4b87160861a6a94b870f3 Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Wed, 1 Mar 2017 10:38:50 +0530 Subject: [PATCH] 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 --- core/sme/inc/csr_internal.h | 1 - core/sme/src/csr/csr_api_roam.c | 5 ++--- core/sme/src/csr/csr_neighbor_roam.c | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index d231f6507a32..d40f53eb4153 100644 --- a/core/sme/inc/csr_internal.h +++ b/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 { diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 8d36d4279fc4..66ff42bc438e 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/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; diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index fc9b6f632463..7d9ab372a395 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/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,