From 2154a71e825fbe59427f1c09d2eab88e29b023a9 Mon Sep 17 00:00:00 2001 From: Nishank Aggarwal Date: Thu, 13 Oct 2016 11:34:27 +0530 Subject: [PATCH] qcacld-3.0: Avoid initializing the pmfcomeback timer twice Currently pmfcomeback timer entry initializing twice. Remove the changes to initialize pmfcomeback timer entry from lim_fill_ft_session as it is already initialize in pe_create_session. Change-Id: I74d6997d9fe861f6e1cc69c233f0de754b3d040a CRs-Fixed: 1077346 --- core/mac/src/pe/lim/lim_ft.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index d690218a2ce4..d4e02035613d 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -493,7 +493,6 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, tSchBeaconStruct *pBeaconStruct; uint32_t selfDot11Mode; ePhyChanBondState cbEnabledMode; - QDF_STATUS status; pBeaconStruct = qdf_mem_malloc(sizeof(tSchBeaconStruct)); if (NULL == pBeaconStruct) { @@ -679,19 +678,6 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, pftSessionEntry->encryptType = psessionEntry->encryptType; #ifdef WLAN_FEATURE_11W pftSessionEntry->limRmfEnabled = psessionEntry->limRmfEnabled; - - if (pftSessionEntry->limRmfEnabled) { - pftSessionEntry->pmfComebackTimerInfo.pMac = pMac; - pftSessionEntry->pmfComebackTimerInfo.sessionID = - psessionEntry->smeSessionId; - status = qdf_mc_timer_init(&pftSessionEntry->pmfComebackTimer, - QDF_TIMER_TYPE_SW, lim_pmf_comeback_timer_callback, - (void *)&pftSessionEntry->pmfComebackTimerInfo); - if (!QDF_IS_STATUS_SUCCESS(status)) - lim_log(pMac, LOGE, - FL("cannot init pmf comeback timer.")); - } - #endif if ((pftSessionEntry->limRFBand == SIR_BAND_2_4_GHZ) && (pftSessionEntry->htSupportedChannelWidthSet ==