commit 5c0680aaab55cdafbcf60fe8fc25c540b9d3027f
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 23 15:14:30 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 23 15:14:30 2016 -0700
tree 0d5a8690266e0949129a50d58599c410517c382e
parent 62775728f7a80229aac9b124f2025a5e37129e6d
parent 179117ac3368cc56db88d2dae60bb9c388f02f77

Merge "wlan: Resolve memory leak issues"

CORE/SME/src/sme_common/sme_Api.c

diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index f96cc64..9006254 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -11845,6 +11845,8 @@
 {
     tHalHandle hHal= (tHalHandle) userData;
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
+    tListElem *pEntry;
+    tSmeCmd *pTempCmd = NULL;
 
     if (NULL == pMac)
     {
@@ -11863,11 +11865,24 @@
         csrLLCount(&pMac->sme.smeCmdActiveList) );
     smeGetCommandQStatus(hHal);
 
+    pEntry = csrLLPeekHead(&pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK);
+    if (pEntry) {
+        pTempCmd = GET_BASE_ADDR(pEntry, tSmeCmd, Link);
+    }
+    /* If user initiated scan took more than active list timeout
+     * abort it.
+     */
+    if (pTempCmd && (eSmeCommandScan == pTempCmd->command) &&
+        (eCsrScanUserRequest == pTempCmd->u.scanCmd.reason)) {
+        sme_AbortMacScan(hHal, pTempCmd->sessionId,
+                                 eCSR_SCAN_ABORT_DEFAULT);
+        return;
+    }
+
     /* Initiate SSR to recover */
     if (!(vos_isLoadUnloadInProgress() ||
         vos_is_logp_in_progress(VOS_MODULE_ID_SME, NULL)))
     {
-       vosTraceDumpAll(pMac,0,0,0,0);
        vos_wlanRestart();
     }
 }