wlan: ESE Support in LFR3

ESE is offloaded in LFR3.
Hence, the required parameters need to be passed
down to firmware.
A few logs related to LFR3 are cleaned up.

Change-Id: I28a182fb3b37eb7ad3e8c1c2c0b22985a1c5876a
CRs-Fixed: 696190

5 files changed, 23 insertions, 24 deletions

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index d4aeb91c7635..1bcdf55a3b05 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -211,7 +211,9 @@ static const u32 hdd_cipher_suites[] =
     WLAN_CIPHER_SUITE_WEP104,
     WLAN_CIPHER_SUITE_TKIP,
 #ifdef FEATURE_WLAN_ESE
+#define WLAN_CIPHER_SUITE_BTK 0x004096fe /* use for BTK */
 #define WLAN_CIPHER_SUITE_KRK 0x004096ff /* use for KRK */
+    WLAN_CIPHER_SUITE_BTK,
     WLAN_CIPHER_SUITE_KRK,
     WLAN_CIPHER_SUITE_CCMP,
 #else
@@ -6853,6 +6855,9 @@ static int __wlan_hdd_cfg80211_add_key( struct wiphy *wiphy,
         case WLAN_CIPHER_SUITE_KRK:
             setKey.encType = eCSR_ENCRYPT_TYPE_KRK;
             break;
+        case WLAN_CIPHER_SUITE_BTK:
+            setKey.encType = eCSR_ENCRYPT_TYPE_BTK;
+            break;
 #endif
 
 #ifdef WLAN_FEATURE_11W
@@ -9142,6 +9147,9 @@ static int wlan_hdd_cfg80211_set_cipher( hdd_adapter_t *pAdapter,
         case WLAN_CIPHER_SUITE_KRK:
             encryptionType = eCSR_ENCRYPT_TYPE_KRK;
             break;
+        case WLAN_CIPHER_SUITE_BTK:
+            encryptionType = eCSR_ENCRYPT_TYPE_BTK;
+            break;
 #endif
             default:
                 hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Unsupported cipher type %d",
diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c
index 61dbb1eb775d..d81f44466d04 100644
--- a/CORE/MAC/src/pe/lim/limFT.c
+++ b/CORE/MAC/src/pe/lim/limFT.c
@@ -1904,9 +1904,9 @@ void limProcessFTRoamOffloadSynchInd(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
     pftSessionEntry->limPrevSmeState = pftSessionEntry->limSmeState;
     pftSessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE;
     pMac->ft.ftPEContext.pftSessionEntry = pftSessionEntry;
-    PELOGE(limLog(pMac,LOGE,"LFR3:%s:created session (%p) with id = %d",
-                  __func__, pftSessionEntry, pftSessionEntry->peSessionId);)
-
+    VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_DEBUG,
+              "LFR3:%s:created session (%p) with id = %d",
+              __func__, pftSessionEntry, pftSessionEntry->peSessionId);
     /* Update the ReAssoc BSSID of the current session */
     sirCopyMacAddr(psessionEntry->limReAssocbssId, pbssDescription->bssId);
     limPrintMacAddr(pMac, psessionEntry->limReAssocbssId, LOG2);
@@ -1918,7 +1918,7 @@ void limProcessFTRoamOffloadSynchInd(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
     {
         pftSessionEntry->is11Rconnection = psessionEntry->is11Rconnection;
 #ifdef FEATURE_WLAN_ESE
-        pftSessionEntry->isCCXconnection = psessionEntry->isESEconnection;
+        pftSessionEntry->isESEconnection = psessionEntry->isESEconnection;
 #endif
 #if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
         pftSessionEntry->isFastTransitionEnabled =
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index 76e2b1175a5d..4fb055b9badc 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -7199,13 +7199,6 @@ void limProcessAddStaRsp(tpAniSirGlobal pMac,tpSirMsgQ limMsgQ)
         vos_mem_free(pAddStaParams);
         return;
     }
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
-    if (psessionEntry->bRoamSynchInProgress)
-    {
-       /* change logging before release */
-       limLog(pMac, LOGE, FL("LFR3:limProcessAddStaRsp"));
-    }
-#endif
     psessionEntry->csaOffloadEnable = pAddStaParams->csaOffloadEnable;
     if (psessionEntry->limSystemRole == eLIM_STA_IN_IBSS_ROLE)
         (void) limIbssAddStaRsp(pMac, limMsgQ->bodyptr,psessionEntry);
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index feb0d850d0ce..e3aeb34c3c47 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -4860,8 +4860,6 @@ eHalStatus csrRoamProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
         break;
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
     case eCsrPerformRoamOffloadSynch:
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
-             "LFR3:%s: Attempting Roam Offload Sync", __func__);
         status = csrRoamIssueFTRoamOffloadSynch(pMac, sessionId,
                                             pCommand->u.roamCmd.pLastRoamBss);
         break;
@@ -8940,9 +8938,9 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi
          ( (!HAL_STATUS_SUCCESS( status ) )
 #ifdef FEATURE_WLAN_ESE
             || ( eCSR_ENCRYPT_TYPE_KRK == pSetKey->encType )
-#ifdef WLAN_FEATURE_WLAN_ROAM
+#ifdef WLAN_FEATURE_ROAM_OFFLOAD
             || ( eCSR_ENCRYPT_TYPE_BTK == pSetKey->encType )
-#endif /* WLAN_FEATURE_WLAN_ROAM */
+#endif /* WLAN_FEATURE_ROAM_OFFLOAD */
 #endif /* FEATURE_WLAN_ESE */
            ) )
     {
@@ -16427,7 +16425,6 @@ void csrRoamOffload(tpAniSirGlobal pMac, tSirRoamOffloadScanReq *pRequestBuf,
         if (csrIsAuthTypeESE(pRequestBuf->ConnectedNetwork.authentication)) {
                 vos_mem_copy(pRequestBuf->KRK,pSession->eseCckmInfo.krk, SIR_KRK_KEY_LEN);
                 vos_mem_copy(pRequestBuf->BTK,pSession->eseCckmInfo.btk, SIR_BTK_KEY_LEN);
-                pRequestBuf->IsESEConnection = eANI_BOOLEAN_TRUE;
         }
 #endif
         pRequestBuf->AcUapsd.acbe_uapsd =
@@ -18424,8 +18421,9 @@ eHalStatus csrRoamDequeueRoamOffloadSynch(tpAniSirGlobal pMac)
         if ( (eSmeCommandRoam == pCommand->command) &&
                 (eCsrPerformRoamOffloadSynch == pCommand->u.roamCmd.roamReason))
         {
-            smsLog( pMac, LOGE, FL("DQ-Command = %d, Reason = %d"),
-                    pCommand->command, pCommand->u.roamCmd.roamReason);
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
+                      "LFR3:DQ-Command = %d, Reason = %d",
+                       pCommand->command, pCommand->u.roamCmd.roamReason);
             if (csrLLRemoveEntry( &pMac->sme.smeCmdActiveList, pEntry, LL_ACCESS_LOCK )) {
                 csrReleaseCommand( pMac, pCommand );
             }
@@ -18525,9 +18523,9 @@ void csrProcessRoamOffloadSynchInd(tpAniSirGlobal pMac, void *pMsgBuf)
                 smeRoamOffloadSynchInd->reassocRespOffset,
                 pMac->roam.reassocRespLen);
 
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
              "LFR3:%s: the reassoc resp frame data:", __func__);
-   VOS_TRACE_HEX_DUMP(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
+   VOS_TRACE_HEX_DUMP(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
               pMac->roam.pReassocResp,
               pMac->roam.reassocRespLen);
 
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 4c5c72ccaffa..ac3330170aa9 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -8652,8 +8652,8 @@ eHalStatus csrScanSaveRoamOffloadApToScanCache(tpAniSirGlobal pMac,
       return eHAL_STATUS_FAILURE;
    }
 
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,"LFR3: Beacon/Prb Rsp:");
-   VOS_TRACE_HEX_DUMP(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,"LFR3: Beacon/Prb Rsp:");
+   VOS_TRACE_HEX_DUMP(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                 pBeaconProbeResp, pRoamOffloadSynchInd->beaconProbeRespLength);
 
    if (pRoamOffloadSynchInd->isBeacon)
@@ -8760,9 +8760,9 @@ eHalStatus csrScanSaveRoamOffloadApToScanCache(tpAniSirGlobal pMac,
                 sizeof(tSirMacAddr));
    pBssDescr->nReceivedTime = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
 
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                                 "LFR3:%s:BssDescr Info:", __func__);
-   VOS_TRACE_HEX_DUMP(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
+   VOS_TRACE_HEX_DUMP(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                                  pBssDescr->bssId, sizeof(tSirMacAddr));
    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
               "chan= %d, rssi = %d",pBssDescr->channelId,pBssDescr->rssi);