diff options
| author | Sreelakshmi Konamki <skonam@codeaurora.org> | 2017-01-03 16:57:59 +0530 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2017-01-04 02:12:19 -0800 |
| commit | 9e1753772de779fa731e67c1fde8ddad3c7f020f (patch) | |
| tree | 38beb11168dbbcb4b1d82a4f6a513f736a48dca6 | |
| parent | 53921a871be376101773eb21d84726a701057a5f (diff) | |
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
| -rw-r--r-- | core/sme/inc/csr_internal.h | 3 | ||||
| -rw-r--r-- | core/sme/src/csr/csr_api_roam.c | 7 | ||||
| -rw-r--r-- | core/sme/src/csr/csr_neighbor_roam.c | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index eea5647552c2..06f539cf8d60 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1003,7 +1003,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 9c6460205deb..3f433dcbd0de 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -17715,9 +17715,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 fe4a92ba9fd4..ef092d7cf6c5 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -149,7 +149,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: @@ -177,7 +176,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, |