diff options
| -rw-r--r-- | core/sme/src/csr/csr_api_roam.c | 4 | ||||
| -rw-r--r-- | core/sme/src/csr/csr_neighbor_roam.c | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 06591ecbf724..52560b37b560 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -20175,7 +20175,7 @@ static void csr_add_rssi_reject_ap_list(tpAniSirGlobal mac_ctx, #define RSO_RESTART_BIT (1<<ROAM_SCAN_OFFLOAD_RESTART) #define RSO_UPDATE_CFG_BIT (1<<ROAM_SCAN_OFFLOAD_UPDATE_CFG) #define RSO_ABORT_SCAN_BIT (1<<ROAM_SCAN_OFFLOAD_ABORT_SCAN) -#define RSO_START_ALLOW_MASK (RSO_STOP_BIT | RSO_UPDATE_CFG_BIT) +#define RSO_START_ALLOW_MASK (RSO_START_BIT |RSO_STOP_BIT | RSO_UPDATE_CFG_BIT) #define RSO_STOP_ALLOW_MASK (RSO_UPDATE_CFG_BIT | RSO_RESTART_BIT | \ RSO_STOP_BIT | RSO_START_BIT | RSO_ABORT_SCAN_BIT) #define RSO_RESTART_ALLOW_MASK (RSO_UPDATE_CFG_BIT | RSO_START_BIT | \ @@ -23087,6 +23087,8 @@ static QDF_STATUS csr_process_roam_sync_callback(tpAniSirGlobal mac_ctx, eCSR_ROAM_SUBSTATE_NONE, session_id); } + csr_neighbor_roam_state_transition(mac_ctx, + eCSR_NEIGHBOR_ROAM_STATE_INIT, session_id); } roam_info->nBeaconLength = 0; roam_info->nAssocReqLength = roam_synch_data->reassoc_req_length - diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 5449d5d98115..4cc5e5abf68b 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-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -1049,9 +1049,14 @@ static void csr_neighbor_roam_info_ctx_init( } else #endif { - csr_roam_offload_scan(pMac, session_id, - ROAM_SCAN_OFFLOAD_START, - REASON_CTX_INIT); + if (!ngbr_roam_info->b_roam_scan_offload_started) + csr_roam_offload_scan(pMac, session_id, + ROAM_SCAN_OFFLOAD_START, + REASON_CTX_INIT); + else + csr_roam_offload_scan(pMac, session_id, + ROAM_SCAN_OFFLOAD_UPDATE_CFG, + REASON_CONNECT); if (roam_profile && roam_profile->supplicant_disabled_roaming) { |