qcacld: Sessionize and fix LFR3.0 compile errors

This change is to sessionize and fix the LFR3.0 compile errors

Change-Id: Ib0365545bc9633b82640fb7915a4aafbf2af4bf4
CRs-Fixed: 698753

11 files changed, 34 insertions, 41 deletions

diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 3651cd7b6731..51f8808b7a0a 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -158,7 +158,7 @@ cbNotifySetEseFeatureEnabled(hdd_context_t *pHddCtx, unsigned long NotifyId)
 {
     /* At the point this routine is called, the value in the cfg_ini
        table has already been updated */
-    sme_UpdateIsEseFeatureEnabled(pHddCtx->hHal,
+    sme_UpdateIsEseFeatureEnabled(pHddCtx->hHal, 0,
                                   pHddCtx->cfg_ini->isEseIniFeatureEnabled );
 }
 #endif
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 50ea5d51dd0d..baf7c8f48c29 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -5043,7 +5043,8 @@ static int hdd_driver_command(hdd_adapter_t *pAdapter,
                       "%s: Received Command to change ese mode = %d", __func__, eseMode);
 
            pHddCtx->cfg_ini->isEseIniFeatureEnabled = eseMode;
-           sme_UpdateIsEseFeatureEnabled(pHddCtx->hHal, eseMode);
+           sme_UpdateIsEseFeatureEnabled(pHddCtx->hHal, pAdapter->sessionId,
+                                         eseMode);
        }
 #endif
        else if (strncmp(command, "SETROAMSCANCONTROL", 18) == 0)
diff --git a/CORE/MAC/src/pe/include/limFTDefs.h b/CORE/MAC/src/pe/include/limFTDefs.h
index 98a9f1d2a1ee..ba238f3a3297 100644
--- a/CORE/MAC/src/pe/include/limFTDefs.h
+++ b/CORE/MAC/src/pe/include/limFTDefs.h
@@ -150,6 +150,7 @@ typedef struct sSirFTRoamOffloadSynchRsp
 {
    tANI_U16    messageType;      /* eWNI_SME_FT_ROAM_OFFLOAD_SYNCH_RSP */
    tANI_U16    length;
+   tANI_U8     sessionId;
    tpSirBssDescription  pbssDescription;
 } tSirFTRoamOffloadSynchRsp, *tpSirFTRoamOffloadSynchRsp;
 #endif
diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c
index e3fc7131d362..b9cee3f4a1b8 100644
--- a/CORE/MAC/src/pe/lim/limFT.c
+++ b/CORE/MAC/src/pe/lim/limFT.c
@@ -1997,7 +1997,6 @@ void limProcessFTRoamOffloadSynchInd(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
     }
     pftSessionEntry->limPrevSmeState = pftSessionEntry->limSmeState;
     pftSessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE;
-    pMac->ft.ftPEContext.pftSessionEntry = pftSessionEntry;
     VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_DEBUG,
               "LFR3:%s:created session (%p) with id = %d",
               __func__, pftSessionEntry, pftSessionEntry->peSessionId);
@@ -2006,26 +2005,9 @@ void limProcessFTRoamOffloadSynchInd(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
     limPrintMacAddr(pMac, psessionEntry->limReAssocbssId, LOG2);
 
     // Prepare the session right now with as much as possible.
-    pftSessionEntry = limFillFTSession(pMac, pbssDescription, psessionEntry);
+    limFillFTSession(pMac, pbssDescription, pftSessionEntry, psessionEntry);
 
-    if (pftSessionEntry)
-    {
-        pftSessionEntry->is11Rconnection = psessionEntry->is11Rconnection;
-#ifdef FEATURE_WLAN_ESE
-        pftSessionEntry->isESEconnection = psessionEntry->isESEconnection;
-#endif
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
-        pftSessionEntry->isFastTransitionEnabled =
-           psessionEntry->isFastTransitionEnabled;
-#endif
-
-#ifdef FEATURE_WLAN_LFR
-        pftSessionEntry->isFastRoamIniFeatureEnabled =
-           psessionEntry->isFastRoamIniFeatureEnabled;
-#endif
-        limFTPrepareAddBssReq( pMac, FALSE, pftSessionEntry, pbssDescription );
-        pMac->ft.ftPEContext.pftSessionEntry = pftSessionEntry;
-    }
+    limFTPrepareAddBssReq( pMac, FALSE, pftSessionEntry, pbssDescription );
 
     pFTRoamOffloadSynchRsp = vos_mem_malloc(rspLen);
     if (NULL == pFTRoamOffloadSynchRsp)
@@ -2038,6 +2020,7 @@ void limProcessFTRoamOffloadSynchInd(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
 
     pFTRoamOffloadSynchRsp->messageType = eWNI_SME_FT_ROAM_OFFLOAD_SYNCH_RSP;
     pFTRoamOffloadSynchRsp->length = (tANI_U16) rspLen;
+    pFTRoamOffloadSynchRsp->sessionId = psessionEntry->smeSessionId;
     pFTRoamOffloadSynchRsp->pbssDescription = pbssDescription;
 
     mmhMsg.type = pFTRoamOffloadSynchRsp->messageType;
diff --git a/CORE/SME/inc/csrNeighborRoam.h b/CORE/SME/inc/csrNeighborRoam.h
index c1023eb12ef2..8658e71cba59 100644
--- a/CORE/SME/inc/csrNeighborRoam.h
+++ b/CORE/SME/inc/csrNeighborRoam.h
@@ -275,7 +275,7 @@ VOS_STATUS csrNeighborRoamUpdateFastRoamingEnabled(tpAniSirGlobal pMac,
                                                  tANI_U8 sessionId,
                                                const v_BOOL_t fastRoamEnabled);
 VOS_STATUS csrNeighborRoamUpdateEseModeEnabled(tpAniSirGlobal pMac,
-                                               tANI_U32 sessionId,
+                                               tANI_U8 sessionId,
                                                const v_BOOL_t eseMode);
 VOS_STATUS csrNeighborRoamChannelsFilterByCurrentBand(
                       tpAniSirGlobal pMac,
@@ -348,7 +348,8 @@ VOS_STATUS csrRoamReadTSF(tpAniSirGlobal pMac, tANI_U8 *pTimestamp,
 #endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 eHalStatus csrNeighborRoamOffloadSynchRspHandler(tpAniSirGlobal pMac,
-                   tpSirFTRoamOffloadSynchRsp pFTRoamOffloadSynchRsp);
+                   tpSirFTRoamOffloadSynchRsp pFTRoamOffloadSynchRsp,
+                   tANI_U8 sessionId);
 #endif
 #endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */
 
diff --git a/CORE/SME/inc/smeRrmInternal.h b/CORE/SME/inc/smeRrmInternal.h
index da95229d9dac..e0a1e0fa00f0 100644
--- a/CORE/SME/inc/smeRrmInternal.h
+++ b/CORE/SME/inc/smeRrmInternal.h
@@ -63,6 +63,7 @@ typedef struct sRrmNeighborReportDesc
    tListElem    List;
    tSirNeighborBssDescription   *pNeighborBssDescription;
    tANI_U32                     roamScore;
+   tANI_U8                      sessionId;
 } tRrmNeighborReportDesc, *tpRrmNeighborReportDesc;
 
 
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 28c6641a151b..6140d07a867a 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -2834,9 +2834,8 @@ eHalStatus sme_UpdateEnableFastRoamInConcurrency(tHalHandle hHal,
           Other status means SME is failed to update isEseIniFeatureEnabled.
   \sa
   --------------------------------------------------------------------------*/
-
-eHalStatus sme_UpdateIsEseFeatureEnabled(tHalHandle hHal,
-        const v_BOOL_t isEseIniFeatureEnabled);
+eHalStatus sme_UpdateIsEseFeatureEnabled(tHalHandle hHal, tANI_U8 sessionId,
+                                       const v_BOOL_t isEseIniFeatureEnabled);
 
 #endif /* FEATURE_WLAN_ESE */
 
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index df1734178aab..86eab361d9d3 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -17882,7 +17882,7 @@ void csrRoamFTPreAuthRspProcessor( tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuth
             eCSR_ROAM_FT_RESPONSE, eCSR_ROAM_RESULT_NONE);
 
 #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
-   if (csrRoamIsESEAssoc(pMac))
+   if (csrRoamIsESEAssoc(pMac, pFTPreAuthRsp->smeSessionId))
    {
       /* read TSF */
       csrRoamReadTSF(pMac, (tANI_U8 *)roamInfo.timestamp,
@@ -18711,7 +18711,7 @@ void csrRoamFTRoamOffloadSynchRspProcessor(
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
 
     if (eHAL_STATUS_SUCCESS != csrNeighborRoamOffloadSynchRspHandler(
-        pMac, pFTRoamOffloadSynchRsp)) {
+        pMac, pFTRoamOffloadSynchRsp, pFTRoamOffloadSynchRsp->sessionId)) {
         /*
          * Bail out if Roam Offload Synch Response was not even handled.
          */
@@ -18719,7 +18719,7 @@ void csrRoamFTRoamOffloadSynchRspProcessor(
                               "was not processed"));
         goto err_synch_rsp;
     }
-    csrNeighborRoamRequestHandoff(pMac);
+    csrNeighborRoamRequestHandoff(pMac, pFTRoamOffloadSynchRsp->sessionId);
     csrRoamDequeueRoamOffloadSynch(pMac);
 
 err_synch_rsp:
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 6accc7be3ef3..de2ae2484535 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -8765,6 +8765,7 @@ eHalStatus csrScanSaveRoamOffloadApToScanCache(tpAniSirGlobal pMac,
    v_TIME_t timer=0;
    tpSirMacMgmtHdr macHeader;
    tANI_U8 *pBeaconProbeResp;
+   tANI_U8 sessionId = pRoamOffloadSynchInd->roamedVdevId;
 
    pBeaconProbeResp = (tANI_U8 *)pRoamOffloadSynchInd +
        pRoamOffloadSynchInd->beaconProbeRespOffset;
@@ -8936,7 +8937,7 @@ eHalStatus csrScanSaveRoamOffloadApToScanCache(tpAniSirGlobal pMac,
       vos_mem_free(pParsedFrame);
       return eHAL_STATUS_RESOURCES;
    }
-   csrScanAddResult(pMac, pScanResult, pIesLocal);
+   csrScanAddResult(pMac, pScanResult, pIesLocal, sessionId);
 
    vos_mem_free(pParsedFrame);
 
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index 1d1cfac5298a..91fb2e3a29bc 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -441,6 +441,7 @@ VOS_STATUS csrNeighborRoamUpdateEseModeEnabled(tpAniSirGlobal pMac,
     tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
              &pMac->roam.neighborRoamInfo[sessionId];
     VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
+    tpFTRoamCallbackUsrCtx     pUsrCtx;
 
     if (eCSR_NEIGHBOR_ROAM_STATE_CONNECTED == pNeighborRoamInfo->neighborRoamState)
     {
@@ -1689,14 +1690,18 @@ DEQ_PREAUTH:
  * \fn     csrNeighborRoamOffloadSynchRspHandler
  * \brief  This function handle the RoamOffloadSynch from PE
  * \param  pMac - The handle returned by macOpen.
- * \return eHAL_STATUS_SUCCESS on success ,
+ * \param  pFTRoamOffloadSynchRsp - Roam offload sync response
+ * \param  sessionId - Session identifier
+ * \return eHAL_STATUS_SUCCESS on success,
  *         eHAL_STATUS_FAILURE otherwise
  * --------------------------------------------------------------------------*/
-eHalStatus csrNeighborRoamOffloadSynchRspHandler(
-    tpAniSirGlobal pMac, tpSirFTRoamOffloadSynchRsp pFTRoamOffloadSynchRsp)
+eHalStatus
+csrNeighborRoamOffloadSynchRspHandler(tpAniSirGlobal pMac,
+                              tpSirFTRoamOffloadSynchRsp pFTRoamOffloadSynchRsp,
+                              tANI_U8 sessionId)
 {
     tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
-                                &pMac->roam.neighborRoamInfo;
+                                &pMac->roam.neighborRoamInfo[sessionId];
     tpCsrNeighborRoamBSSInfo pBssInfo;
     tANI_U16 bssDescLen;
     tpSirFTPreAuthReq pftPreAuthReq;
@@ -1748,9 +1753,9 @@ eHalStatus csrNeighborRoamOffloadSynchRspHandler(
     vos_mem_copy(&pftPreAuthReq->preAuthbssId,
                  pFTRoamOffloadSynchRsp->pbssDescription->bssId,
                  sizeof(tSirMacAddr));
-    pMac->ft.ftPEContext.pFTPreAuthReq = pftPreAuthReq;
 
-    CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE)
+    CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE,
+                                       sessionId)
     pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries = 0;
     VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
                "LFR3:Entry added to Auth Done List");
@@ -5074,9 +5079,9 @@ eHalStatus csrNeighborRoamIndicateConnect(tpAniSirGlobal pMac,
                          pSession->roamOffloadSynchParams.bRoamSynchInProgress =
                          VOS_FALSE;
                          if (eSIR_ROAM_AUTH_STATUS_CONNECTED ==
-                             pSession->roamOffloadSynchParams.authStatus)
-                         {
-                             csrRoamOffloadScan(pMac, ROAM_SCAN_OFFLOAD_START,
+                             pSession->roamOffloadSynchParams.authStatus) {
+                             csrRoamOffloadScan(pMac, sessionId,
+                                                ROAM_SCAN_OFFLOAD_START,
                                                 REASON_CONNECT);
                          }
                      } else
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 2065459f3251..cd83dded76c4 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -9735,7 +9735,8 @@ eHalStatus sme_UpdateIsEseFeatureEnabled
            pMac->roam.configParam.isEseIniFeatureEnabled,
            isEseIniFeatureEnabled);
     pMac->roam.configParam.isEseIniFeatureEnabled = isEseIniFeatureEnabled;
-    csrNeighborRoamUpdateEseModeEnabled(pMac, isEseIniFeatureEnabled);
+    csrNeighborRoamUpdateEseModeEnabled(pMac, sessionId,
+                                        isEseIniFeatureEnabled);
 
     if (TRUE == isEseIniFeatureEnabled)
     {