wlan: Removing unnecessary mlm initialization

Cleaning up unnecessary MLM initialization at multiple places in
the UMAC. limMlmInit() is always called in limStart(). Also
removing unnecessary timer initialization code across UMAC.

Change-Id: I0aea1f84a78241158c4b728963cdea652c215e45
CRs-Fixed: 660400

4 files changed, 2 insertions, 64 deletions

diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 502b5f83e240..87bc9eb9a1fc 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -728,13 +728,6 @@ limInitialize(tpAniSirGlobal pMac)
         return status;
     }
 
-    /*
-     * MLM will be intitalized when 'START' request comes from SME.
-     * limInitMlm calls limCreateTimers, which actually relies on
-     * CFG to be downloaded. So it should not be called as part of
-     * peStart, as CFG download is happening after peStart.
-     */
-    //limInitMlm(pMac);
     // Initializations for maintaining peers in IBSS
     limIbssInit(pMac);
 
@@ -751,34 +744,6 @@ limInitialize(tpAniSirGlobal pMac)
 
     vos_list_init(&pMac->lim.gLimMgmtFrameRegistratinQueue);
 
-#if 0
-
-    vos_trace_setLevel(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR);
-    vos_trace_setLevel(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_WARN);
-    vos_trace_setLevel(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_FATAL);
-
-    vos_trace_setLevel(VOS_MODULE_ID_HAL, VOS_TRACE_LEVEL_WARN);
-    vos_trace_setLevel(VOS_MODULE_ID_HAL, VOS_TRACE_LEVEL_ERROR);
-
-    vos_trace_setLevel(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_WARN);
-    vos_trace_setLevel(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR);
-    vos_trace_setLevel(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR);
-
-    vos_trace_setLevel(VOS_MODULE_ID_SAL, VOS_TRACE_LEVEL_ERROR);
-
-    vos_trace_setLevel(VOS_MODULE_ID_SSC, VOS_TRACE_LEVEL_ERROR);
-
-    vos_trace_setLevel(VOS_MODULE_ID_SAL, VOS_TRACE_LEVEL_ERROR);
-    vos_trace_setLevel(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR);
-
-    vos_trace_setLevel(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR);
-
-
-    vos_trace_setLevel(VOS_MODULE_ID_BAL, VOS_TRACE_LEVEL_ERROR);
-
-    vos_trace_setLevel(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR);
-#endif
-
     //Initialize the configurations needed by PE
     if( eSIR_FAILURE == __limInitConfig(pMac))
     {
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index 11029b825c80..7bf4ecc6a07e 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -2530,9 +2530,6 @@ limProcessApMlmAddBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ)
         }
 #endif
         limInitPeerIdxpool(pMac,psessionEntry);
-        // Create timers used by LIM
-        if (!pMac->lim.gLimTimersCreated)
-            limCreateTimers(pMac);
 
         // Start OLBC timer
         if (tx_timer_activate(&pMac->lim.limTimers.gLimUpdateOlbcCacheTimer) != TX_SUCCESS)
@@ -2645,11 +2642,7 @@ limProcessIbssMlmAddBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ ,tpPESession
        //limInitPreAuthList(pMac);
         if (0 == psessionEntry->freePeerIdxHead)
             limInitPeerIdxpool(pMac,psessionEntry);
-        // Create timers used by LIM
-#ifdef FIXME_GEN6  //following code may not be required, as limCreateTimers is now invoked from limInitialize (peStart)
-        if (!pMac->lim.gLimTimersCreated)
-            limCreateTimers(pMac);
-#endif
+
         /* Update the lim global gLimTriggerBackgroundScanDuringQuietBss */
         if( eSIR_SUCCESS != wlan_cfgGetInt( pMac, WNI_CFG_TRIG_STA_BK_SCAN, &val ))
             limLog( pMac, LOGP, FL("Failed to get WNI_CFG_TRIG_STA_BK_SCAN!"));
@@ -4692,9 +4685,7 @@ limProcessBtampAddBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ ,tpPESession ps
         psessionEntry->bssIdx = (tANI_U8) pAddBssParams->bssIdx;
         schEdcaProfileUpdate(pMac, psessionEntry);
         limInitPeerIdxpool(pMac,psessionEntry);
-        // Create timers used by LIM
-        if (!pMac->lim.gLimTimersCreated)
-        limCreateTimers(pMac);
+
       /* Update the lim global gLimTriggerBackgroundScanDuringQuietBss */
         if( eSIR_SUCCESS != wlan_cfgGetInt( pMac, WNI_CFG_TRIG_STA_BK_SCAN, &val ))
             limLog( pMac, LOGP, FL("Failed to get WNI_CFG_TRIG_STA_BK_SCAN!"));
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index e22c7bb478d6..32844bf00686 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -379,9 +379,6 @@ __limProcessSmeStartReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf)
         /// By default do not return after first scan match
         pMac->lim.gLimReturnAfterFirstMatch = 0;
 
-        /// Initialize MLM state machine
-        limInitMlm(pMac);
-
         /// By default return unique scan results
         pMac->lim.gLimReturnUniqueResults = true;
         pMac->lim.gLimSmeScanResultLength = 0;
@@ -855,16 +852,6 @@ __limHandleSmeStartBssRequest(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf)
         // Delete pre-auth list if any
         limDeletePreAuthList(pMac);
 
-        // Delete IBSS peer BSSdescription list if any
-        //limIbssDelete(pMac); sep 26 review
-
-
-
-#ifdef FIXME_GEN6   //following code may not be required. limInitMlm is now being invoked during peStart
-        /// Initialize MLM state machine
-        limInitMlm(pMac);
-#endif
-
         psessionEntry->htCapability = IS_DOT11_MODE_HT(pSmeStartBssReq->dot11mode);
 
             /* keep the RSN/WPA IE information in PE Session Entry
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index 1cc17f68be73..b1d0b587bdca 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -915,11 +915,6 @@ limInitMlm(tpAniSirGlobal pMac)
     /// Initialize MAC based Authentication STA list
     limInitPreAuthList(pMac);
 
-    //pMac->lim.gpLimMlmJoinReq = NULL;
-
-    if (pMac->lim.gLimTimersCreated)
-        return;
-
     // Create timers used by LIM
     retVal = limCreateTimers(pMac);
     if(retVal == TX_SUCCESS)