From 8dbf4b5654b7cfe284b5efdc562d6aa1323ce6ce Mon Sep 17 00:00:00 2001 From: nakul kachhwaha Date: Mon, 3 Jun 2019 13:27:49 +0530 Subject: [PATCH] qcacld-3.0: Check neighbor roam state before disconnecting Wait for LFR 2.0 based Roaming sequence to complete before processing disconnect command from cfg80211. Change-Id: Ib596aa56ccc322f5ba87b46685bbc299793c9d5b CRs-Fixed: 2464112 --- core/hdd/src/wlan_hdd_cfg80211.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index a110ab6d2b54..e988a2885588 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -18666,7 +18666,9 @@ int wlan_hdd_disconnect(struct hdd_adapter *adapter, u16 reason) * */ INIT_COMPLETION(adapter->roaming_comp_var); - if (hdd_is_roaming_in_progress(hdd_ctx)) { + if (hdd_is_roaming_in_progress(hdd_ctx) || + sme_neighbor_middle_of_roaming(mac_handle, + adapter->vdev_id)) { rc = wait_for_completion_timeout( &adapter->roaming_comp_var, msecs_to_jiffies(WLAN_WAIT_TIME_STOP_ROAM));