commit 51ad250482839f7d20840dfa59a2bdf652ae7ccd
author Linux Build Service Account <lnxbuild@localhost> Fri Feb 05 00:20:12 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Feb 05 00:20:12 2016 -0800
tree f0aa357098fb74e6499172dc60c2b860c2842b0e
parent 05a410bc79924e6ba414f2fa456a662ed3101328
parent 289084233161c1b8a4c8d1f3bedc2bb730c6aa49

Merge "Wlan: Fix propagation issue"

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