diff options
| author | Archana Ramachandran <archanar@qca.qualcomm.com> | 2016-02-17 17:00:38 -0800 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-03-02 14:45:59 +0530 |
| commit | ca806144b051a7a3eeed1eba41ed998fce3283ba (patch) | |
| tree | b6307bacc3313409c1ce171bf02d8b400a5d3e12 | |
| parent | cb1c9d7571073e386ac57130eb03c8d2e5d51d31 (diff) | |
cld-2.0: Revert send disconnect event for userspace initiated disconnect
For userspace initiated disconnect calling cfg80211_disconnect
from the host driver is resulting in from disconnect AP flag
set to true. This is causing state mismatch between userspace
and the driver and the connection retrial to fail
CRs-Fixed: 979555
Change-Id: Ie9814745515e1eca519e418b243a3c1d06f25701
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_assoc.c | 7 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 9 |
2 files changed, 2 insertions, 14 deletions
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index 7d959881bcb1..56efd4da4c89 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -974,12 +974,9 @@ static eHalStatus hdd_DisConnectHandler( hdd_adapter_t *pAdapter, tCsrRoamInfo * #endif /* QCA_PKT_PROTO_TRACE */ /* HDD has initiated disconnect, do not send disconnect indication - * to kernel. Sending disconnected event to kernel for userspace - * initiated disconnect will be handled by hdd_DisConnectHandler call - * to cfg80211_disconnected + * to kernel. */ - if ((eConnectionState_Disconnecting == pHddStaCtx->conn_info.connState) || - (eConnectionState_NotConnected == pHddStaCtx->conn_info.connState)) + if (eConnectionState_Disconnecting == pHddStaCtx->conn_info.connState) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, FL(" HDD has initiated a disconnect, no need to send" diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 34c7e3ed6c48..46223a1176a7 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -18101,15 +18101,6 @@ disconnected: FL("Set HDD connState to eConnectionState_NotConnected")); hdd_connSetConnectionState(pAdapter, eConnectionState_NotConnected); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0) - /* Sending disconnect event to userspace for kernel version < 3.11 - * is handled by __cfg80211_disconnect call to __cfg80211_disconnected - */ - hddLog(LOG1, FL("Send disconnected event to userspace")); - cfg80211_disconnected(pAdapter->dev, WLAN_REASON_UNSPECIFIED, - NULL, 0, GFP_KERNEL); -#endif - EXIT(); return result; } |