commit 218e29099b7cf7c3ccf5bd46dc15f88b8c7705b3
author Linux Build Service Account <lnxbuild@localhost> Thu Jan 07 13:29:44 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jan 07 13:29:44 2016 -0800
tree f0844afb5fcb54807a221060514797c632bb0b30
parent 6765883285a44fb7126a833ca95602ff2ce748ab
parent 038abc158cee63b4da5511a66d7bc6318135380e

Merge "wlan: Remove irrelevant checks in Monitor Mode."

CORE/MAC/src/dph/dphHashTable.c

diff --git a/CORE/MAC/src/dph/dphHashTable.c b/CORE/MAC/src/dph/dphHashTable.c
index 161779d..90926f5 100644
--- a/CORE/MAC/src/dph/dphHashTable.c
+++ b/CORE/MAC/src/dph/dphHashTable.c
@@ -443,7 +443,6 @@
 #ifdef WLAN_FEATURE_11W
       ptr->last_assoc_received_time = 0;
 #endif
-
       ptr->next = 0;
     }
   else

CORE/MAC/src/pe/lim/limProcessDeauthFrame.c

diff --git a/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c b/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
index a7d4df8..529e6b5 100644
--- a/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
@@ -455,7 +455,8 @@
     }
 
     if ((pStaDs->mlmStaContext.mlmState == eLIM_MLM_WT_DEL_STA_RSP_STATE) ||
-        (pStaDs->mlmStaContext.mlmState == eLIM_MLM_WT_DEL_BSS_RSP_STATE))
+        (pStaDs->mlmStaContext.mlmState == eLIM_MLM_WT_DEL_BSS_RSP_STATE) ||
+        (pStaDs->isDisassocDeauthInProgress))
     {
         /**
          * Already in the process of deleting context for the peer
@@ -468,6 +469,7 @@
            pStaDs->isDisassocDeauthInProgress);)
         return;
     } 
+    pStaDs->isDisassocDeauthInProgress++;
     pStaDs->mlmStaContext.disassocReason = (tSirMacReasonCodes)reasonCode;
     pStaDs->mlmStaContext.cleanupTrigger = eLIM_PEER_ENTITY_DEAUTH;
 

CORE/MAC/src/pe/lim/limProcessDisassocFrame.c

diff --git a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
index 32e15b2..5379cf3 100644
--- a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
@@ -269,7 +269,8 @@
     }
 
     if ((pStaDs->mlmStaContext.mlmState == eLIM_MLM_WT_DEL_STA_RSP_STATE) ||
-        (pStaDs->mlmStaContext.mlmState == eLIM_MLM_WT_DEL_BSS_RSP_STATE))
+        (pStaDs->mlmStaContext.mlmState == eLIM_MLM_WT_DEL_BSS_RSP_STATE) ||
+        (pStaDs->isDisassocDeauthInProgress))
     {
         /**
          * Already in the process of deleting context for the peer
@@ -300,6 +301,8 @@
 
     } // if (pStaDs->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE)
 
+    pStaDs->isDisassocDeauthInProgress++;
+
     pStaDs->mlmStaContext.cleanupTrigger = eLIM_PEER_ENTITY_DISASSOC;
     pStaDs->mlmStaContext.disassocReason = (tSirMacReasonCodes) reasonCode;