commit c089cec946c715e145710cda0a1402000e1b9c74
author Agarwal Ashish <ashishka@qti.qualcomm.com> Mon Aug 10 13:10:04 2015 +0530
committer Satyanarayana Dash <sadash@codeaurora.org> Wed Aug 12 19:18:47 2015 +0530
tree c922184ea759501661dd2f14cec07f9fdd4b40dc
parent e74e42ce7b73ec1e49ab19227785d5a6e9e4df7c

wlan: Properly handle disconnect request from userspace

1)Currently we notify connect event to CFG80211 module eventhough
  there is disconnect request from upperlayer being queued
  in case of disconnect timeout.
2)Cancel ongoing ROC to avoid defer processing of disconnect command
  until ROC completion.
change made to address the same

CRs-Fixed: 887478
Change-Id: I2c46216840f3bffddcbe37cdc3a53e335287fe49

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 91f2b64..7883d9a 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -12581,7 +12581,7 @@
                 hdd_abort_mac_scan(pHddCtx, pScanInfo->sessionId,
                                    eCSR_SCAN_ABORT_DEFAULT);
             }
-
+            wlan_hdd_cancel_existing_remain_on_channel(pAdapter);
 #ifdef FEATURE_WLAN_TDLS
             /* First clean up the tdls peers if any */
             for (staIdx = 0 ; staIdx < HDD_MAX_NUM_TDLS_STA; staIdx++)