From f40cedc06684619f57dbd9dee48b7435596f6c55 Mon Sep 17 00:00:00 2001 From: gaurank kathpalia Date: Tue, 4 Jun 2019 16:57:54 +0530 Subject: [PATCH] qcacld-3.0: Do not reset roam invoke in progress in default case Do not reset roam invoke in progress in default switch case. Change-Id: I3f1bb9f78bb7d23e72973e6e6977b42387755e71 CRs-Fixed: 2465090 --- core/hdd/src/wlan_hdd_nud_tracking.c | 3 ++- core/sme/src/csr/csr_api_roam.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/hdd/src/wlan_hdd_nud_tracking.c b/core/hdd/src/wlan_hdd_nud_tracking.c index c4fd2bf139e8..ee05e36da311 100644 --- a/core/hdd/src/wlan_hdd_nud_tracking.c +++ b/core/hdd/src/wlan_hdd_nud_tracking.c @@ -224,6 +224,7 @@ hdd_handle_nud_fail_sta(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter) { struct reject_ap_info ap_info; + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); qdf_mutex_acquire(&adapter->disconnection_status_lock); if (adapter->disconnection_in_progress) { @@ -241,7 +242,7 @@ hdd_handle_nud_fail_sta(struct hdd_context *hdd_ctx, hdd_debug("nud fail detected, try roaming to better BSSID, vdev id: %d", adapter->vdev_id); - ap_info.bssid = adapter->mac_addr; + ap_info.bssid = sta_ctx->conn_info.bssid; ap_info.reject_ap_type = DRIVER_AVOID_TYPE; ucfg_blm_add_bssid_to_reject_list(hdd_ctx->pdev, &ap_info); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 4ed2a0e7a5b7..77a7ebd78d06 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -21735,7 +21735,6 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx, goto end; default: sme_debug("LFR3: callback reason %d", reason); - vdev_roam_params->roam_invoke_in_progress = false; status = QDF_STATUS_E_FAILURE; goto end; }