diff options
| -rw-r--r-- | core/hdd/src/wlan_hdd_assoc.c | 9 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg80211.c | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index e04e9a0ed1ff..618b2875813a 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1873,12 +1873,13 @@ static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, * eConnectionState_Connecting state mean that connection is in * progress so no need to set state to eConnectionState_NotConnected */ - if ((eConnectionState_Connecting != - pHddStaCtx->conn_info.connState)) { + if (eConnectionState_Connecting != pHddStaCtx->conn_info.connState) hdd_conn_set_connection_state(pAdapter, eConnectionState_NotConnected); - hdd_set_roaming_in_progress(false); - } + + /* Clear roaming in progress flag */ + hdd_set_roaming_in_progress(false); + #ifdef WLAN_FEATURE_GTK_OFFLOAD if ((QDF_STA_MODE == pAdapter->device_mode) || (QDF_P2P_CLIENT_MODE == pAdapter->device_mode)) { diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 9d53066ec6c9..fdc20ab86bc9 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -18500,6 +18500,8 @@ int wlan_hdd_try_disconnect(hdd_adapter_t *pAdapter) if (!rc) { hdd_err("roaming comp var timed out session Id: %d", pAdapter->sessionId); + /* Clear roaming in progress flag */ + hdd_set_roaming_in_progress(false); } if (pAdapter->roam_ho_fail) { INIT_COMPLETION(pAdapter->disconnect_comp_var); @@ -18884,6 +18886,8 @@ int wlan_hdd_disconnect(hdd_adapter_t *pAdapter, u16 reason) if (!rc) { hdd_err("roaming comp var timed out session Id: %d", pAdapter->sessionId); + /* Clear roaming in progress flag */ + hdd_set_roaming_in_progress(false); } if (pAdapter->roam_ho_fail) { INIT_COMPLETION(pAdapter->disconnect_comp_var); |