From 3e213e5f36d0df0f34ecc73b9074903500dd5af6 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Thu, 24 Nov 2016 16:24:15 -0800 Subject: [PATCH] qcacld-3.0: Do not invalidate HDD context if roaming in progress Do not invalidate the HDD context if roaming is in progress. Move the condition outside of the validation check Change-Id: Idd56cbbc63ce56000f03fc47b6f1b78d53cb170f CRs-Fixed: 1094301 --- core/hdd/src/wlan_hdd_cfg80211.c | 5 +++++ core/hdd/src/wlan_hdd_main.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index f69cc003cb44..552673ebd51b 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -12897,6 +12897,11 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, status = wlan_hdd_validate_context(pHddCtx); + if (hdd_is_roaming_in_progress()) { + hdd_err("Roaming In Progress. Ignore!!!"); + return -EAGAIN; + } + if (0 != status) return status; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 1e4b63c9fbdb..2d352a7c1e0b 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -595,11 +595,6 @@ int wlan_hdd_validate_context(hdd_context_t *hdd_ctx) return -EAGAIN; } - if (hdd_is_roaming_in_progress()) { - hdd_err("Roaming In Progress. Ignore!!!"); - return -EAGAIN; - } - return 0; }