commit dfd2caeef1fc03ed874952df823ac99140a1faf5
author Nirav Shah <nnshah@qti.qualcomm.com> Fri May 08 05:34:41 2015 -0700
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Mon May 11 19:55:07 2015 +0530
tree dfc74d25b6e840c9f9c1857cc7905b1812df3f5b
parent 93d205f1d89caf1d18788b282a577202463e43d7

Revert "wlan: serialize ula callback initialization"

This reverts commit 8703607bd263b15e74af3fe9b949ea481ab2e67c

CRs-Fixed: 834793
Change-Id: I8cb59a7513641a5b2a67693b774c2e250fdd9592

CORE/TL/src/wlan_qct_tl.c

diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c
index 917fdda..34526c2 100644
--- a/CORE/TL/src/wlan_qct_tl.c
+++ b/CORE/TL/src/wlan_qct_tl.c
@@ -1150,37 +1150,17 @@
     return VOS_STATUS_E_FAILURE;
   }
 
-  if (!VOS_IS_STATUS_SUCCESS(vos_lock_acquire(&(pClientSTA->ulaLock))))
-  {
-        TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
-                "%s Get ULA Lock Fail", __func__));
-        return VOS_STATUS_E_FAILURE;
-  }
-
   if (pClientSTA->isEapolM4Transmitted ||
       pClientSTA->tlState == WLANTL_STA_AUTHENTICATED)
   {
     TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO,
            "WLAN TL: M4 is already received on %s", __func__));
-    if (!VOS_IS_STATUS_SUCCESS(vos_lock_release(&(pClientSTA->ulaLock))))
-    {
-        TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
-                "%s Release ULA Lock Fail", __func__));
-        return VOS_STATUS_E_FAILURE;
-    }
     return VOS_STATUS_E_ALREADY;
   }
 
   pClientSTA->pfnSTAUlaComplete = (WLANTL_STAUlaCompleteCBType) callbackRoutine;
   pClientSTA->pUlaCBCtx = callbackContext;
 
-  if (!VOS_IS_STATUS_SUCCESS(vos_lock_release(&(pClientSTA->ulaLock))))
-  {
-        TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
-                "%s Release ULA Lock Fail", __func__));
-        return VOS_STATUS_E_FAILURE;
-  }
-
   return VOS_STATUS_SUCCESS;
 }
 
@@ -1328,7 +1308,6 @@
   pClientSTA->wSTADesc.ucSTAId  = pwSTADescType->ucSTAId;
   pClientSTA->ptkInstalled = 0;
   pClientSTA->isEapolM4Transmitted = 0;
-  vos_lock_init(&pClientSTA->ulaLock);
 
   TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
              "WLAN TL:Registering STA Client ID: %d with UC %d and BC %d", 
@@ -1622,8 +1601,6 @@
      vos_lock_destroy(&pTLCb->atlSTAClients[ucSTAId]->atlBAReorderInfo[ucIndex].reorderLock);
   }
 
-  /* delete ulaLock*/
-  vos_lock_destroy(&pTLCb->atlSTAClients[ucSTAId]->ulaLock);
 #ifdef FEATURE_WLAN_TDLS
   /* decrement ucTdlsPeerCount only if it is non-zero */  
   if(WLAN_STA_TDLS == pTLCb->atlSTAClients[ucSTAId]->wSTADesc.wSTAType
@@ -7673,25 +7650,11 @@
   // call ULA complete once M4 BD is filled.
   if (tlMetaInfo.ucEapolSubType == EAPOL_M4)
   {
-     if (!VOS_IS_STATUS_SUCCESS(vos_lock_acquire(&(pClientSTA->ulaLock))))
-     {
-        TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
-                "%s Get ULA Lock Fail", __func__));
-        return VOS_STATUS_E_FAILURE;
-     }
-
      pClientSTA->isEapolM4Transmitted = 1;
      if (pClientSTA->pfnSTAUlaComplete)
          pClientSTA->pfnSTAUlaComplete(pClientSTA->pUlaCBCtx);
      pClientSTA->pfnSTAUlaComplete = NULL;
      pClientSTA->pUlaCBCtx = NULL;
-
-     if (!VOS_IS_STATUS_SUCCESS(vos_lock_release(&(pClientSTA->ulaLock))))
-     {
-        TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
-                "%s Release ULA Lock Fail", __func__));
-        return VOS_STATUS_E_FAILURE;
-     }
   }
 
   /*-----------------------------------------------------------------------

CORE/TL/src/wlan_qct_tli.h

diff --git a/CORE/TL/src/wlan_qct_tli.h b/CORE/TL/src/wlan_qct_tli.h
index 07852da..93794d2 100644
--- a/CORE/TL/src/wlan_qct_tli.h
+++ b/CORE/TL/src/wlan_qct_tli.h
@@ -688,7 +688,6 @@
 
   /* Flag to check EAPOL 4/4 recevied by TL*/
   v_U8_t isEapolM4Transmitted;
-  vos_lock_t ulaLock;
 
   v_U32_t       linkCapacity;