diff options
| author | Varun Reddy Yeturu <varunreddy.yeturu@codeaurora.org> | 2016-11-24 16:24:15 -0800 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-11-29 16:08:00 -0800 |
| commit | 6fb0272dc2dff92c4ef8fc03be9daa1cd155a71e (patch) | |
| tree | 1128b048410438e30239277057f4aee2fe40d77b | |
| parent | ab62b5f059f8cd85ca942a1c0ad202f9b99c3477 (diff) | |
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
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg80211.c | 5 | ||||
| -rw-r--r-- | 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 74d44d0076db..26e58ec20c8d 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -12805,6 +12805,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 defb2448f34f..62b6794e7cd3 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -588,11 +588,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; } |