Merge "Merge remote-tracking branch 'origin/caf/caf-wlan/master'"

63 files changed, 5092 insertions, 4362 deletions

diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index db2f23757aae..fc38b98a9286 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1385,6 +1385,7 @@ void hdd_checkandupdate_phymode( hdd_context_t *pHddCtx);
 #endif
 
 int hdd_wmmps_helper(hdd_adapter_t *pAdapter, tANI_U8 *ptr);
+int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate);
 
 int hdd_wlan_startup(struct device *dev, void *hif_sc);
 void __hdd_wlan_exit(void);
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index aaa68744e1d0..0a9c2bcad2e5 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -2284,6 +2284,7 @@ eHalStatus hdd_RoamTdlsStatusUpdateHandler(hdd_adapter_t *pAdapter,
 #ifdef CONFIG_TDLS_IMPLICIT
     tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);
 #endif
+    tSmeTdlsPeerStateParams smeTdlsPeerStateParams;
 #endif
     eHalStatus status = eHAL_STATUS_FAILURE ;
     tANI_U8 staIdx;
@@ -2466,6 +2467,31 @@ eHalStatus hdd_RoamTdlsStatusUpdateHandler(hdd_adapter_t *pAdapter,
                                 MAC_ADDR_ARRAY(pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes));
                     wlan_hdd_tdls_reset_peer(pAdapter, pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes);
                     hdd_roamDeregisterTDLSSTA ( pAdapter,  pHddCtx->tdlsConnInfo[staIdx].staId );
+#ifdef QCA_WIFI_2_0
+                    vos_mem_zero(&smeTdlsPeerStateParams,
+                                 sizeof(smeTdlsPeerStateParams));
+                    smeTdlsPeerStateParams.vdevId =
+                                 pHddCtx->tdlsConnInfo[staIdx].sessionId;
+                    vos_mem_copy(&smeTdlsPeerStateParams.peerMacAddr,
+                                 &pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes,
+                                 VOS_MAC_ADDR_SIZE);
+                    smeTdlsPeerStateParams.peerState =
+                                 eSME_TDLS_PEER_STATE_TEARDOWN;
+
+                    VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+                              ("hdd_tdlsStatusUpdate: calling sme_UpdateTdlsPeerState for staIdx %d " MAC_ADDRESS_STR),
+                                pHddCtx->tdlsConnInfo[staIdx].staId,
+                                MAC_ADDR_ARRAY(pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes));
+                    status = sme_UpdateTdlsPeerState(pHddCtx->hHal,
+                                                     &smeTdlsPeerStateParams);
+                    if (eHAL_STATUS_SUCCESS != status)
+                    {
+                       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+                                 "%s: sme_UpdateTdlsPeerState failed for "
+                                 MAC_ADDRESS_STR, __func__,
+                                 MAC_ADDR_ARRAY(pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes));
+                    }
+#endif
                     wlan_hdd_tdls_decrement_peer_count(pAdapter);
 
                     (WLAN_HDD_GET_CTX(pAdapter))->sta_to_adapter[staIdx] = NULL;
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index e71261dedc11..30ad93ef3e27 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -2257,6 +2257,58 @@ eHalStatus hdd_parse_plm_cmd(tANI_U8 *pValue, tSirPlmReq *pPlmRequest)
 }
 #endif
 
+int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate)
+{
+   tSirRateUpdateInd *rateUpdate;
+   eHalStatus status;
+   hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+   hdd_config_t *pConfig = NULL;
+
+   if (pHddCtx == NULL) {
+      VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+         "%s: HDD context is null", __func__);
+      return -EINVAL;
+   }
+   if ((WLAN_HDD_IBSS != pAdapter->device_mode) &&
+       (WLAN_HDD_SOFTAP != pAdapter->device_mode) &&
+       (WLAN_HDD_INFRA_STATION != pAdapter->device_mode))
+   {
+      VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+         "%s: Received SETMCRATE command in invalid mode %d \n"
+         "SETMCRATE command is only allowed in STA, IBSS or SOFTAP mode",
+         __func__, pAdapter->device_mode);
+      return -EINVAL;
+   }
+   pConfig = pHddCtx->cfg_ini;
+   rateUpdate = (tSirRateUpdateInd *)vos_mem_malloc(sizeof(tSirRateUpdateInd));
+   if (NULL == rateUpdate)
+   {
+      hddLog(VOS_TRACE_LEVEL_ERROR,
+         "%s: SETMCRATE indication alloc fail", __func__);
+      return -EFAULT;
+   }
+   vos_mem_zero(rateUpdate, sizeof(tSirRateUpdateInd ));
+   rateUpdate->nss = (pConfig->enable2x2 == 0) ? 0 : 1;
+   rateUpdate->dev_mode = pAdapter->device_mode;
+   rateUpdate->mcastDataRate24GHz = targetRate;
+   rateUpdate->mcastDataRate5GHz = targetRate;
+   rateUpdate->bcastDataRate = -1;
+   memcpy(rateUpdate->bssid, pAdapter->macAddressCurrent.bytes,
+      sizeof(rateUpdate->bssid));
+   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+      "%s: MC Target rate %d, mac = %pM, dev_mode = %d",
+      __func__, rateUpdate->mcastDataRate24GHz, rateUpdate->bssid,
+      pAdapter->device_mode);
+   status = sme_SendRateUpdateInd(pHddCtx->hHal, rateUpdate);
+   if (eHAL_STATUS_SUCCESS != status) {
+      hddLog(VOS_TRACE_LEVEL_ERROR,
+         "%s: SETMCRATE failed", __func__);
+      vos_mem_free(rateUpdate);
+      return -EFAULT;
+   }
+   return 0;
+}
+
 int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
    hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
@@ -4268,46 +4320,12 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        {
            tANI_U8 *value = command;
            int      targetRate;
-           tSirRateUpdateInd *rateUpdate;
-           eHalStatus status;
-           hdd_config_t *pConfig = pHddCtx->cfg_ini;
-           hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
            /* Move pointer to ahead of SETMCRATE<delimiter> */
            /* input value is in units of hundred kbps */
            value = value + 10;
            /* Convert the value from ascii to integer, decimal base */
            ret = kstrtouint(value, 10, &targetRate);
-
-           rateUpdate = (tSirRateUpdateInd *)vos_mem_malloc(sizeof(tSirRateUpdateInd));
-           if (NULL == rateUpdate)
-           {
-              hddLog(VOS_TRACE_LEVEL_ERROR,
-                     "%s: SETMCRATE indication alloc fail", __func__);
-              ret = -EFAULT;
-              goto exit;
-           }
-           vos_mem_zero(rateUpdate, sizeof(tSirRateUpdateInd ));
-
-           VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
-                     "MC Target rate %d", targetRate);
-
-           rateUpdate->nss = (pConfig->enable2x2 == 0) ? 0 : 1;
-           rateUpdate->dev_mode = pAdapter->device_mode;
-           rateUpdate->mcastDataRate24GHz = targetRate;
-           rateUpdate->mcastDataRate5GHz = targetRate;
-           rateUpdate->bcastDataRate = -1;
-           memcpy(rateUpdate->bssid, pHddStaCtx->conn_info.bssId,
-               sizeof(rateUpdate->bssid));
-
-           status = sme_SendRateUpdateInd(pHddCtx->hHal, rateUpdate);
-           if (eHAL_STATUS_SUCCESS != status)
-           {
-              hddLog(VOS_TRACE_LEVEL_ERROR,
-                     "%s: SET_MC_RATE failed", __func__);
-              vos_mem_free(rateUpdate);
-              ret = -EFAULT;
-              goto exit;
-           }
+           ret = wlan_hdd_set_mc_rate(pAdapter, targetRate);
        }
        else {
            hddLog( VOS_TRACE_LEVEL_WARN, "%s: Unsupported GUI command %s",
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 10981ef56452..ef9a1b66efba 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -234,6 +234,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = { {2412, 1}, {2417, 2},
 #define WE_SET_EARLY_RX_SLOP_STEP             78
 #define WE_SET_EARLY_RX_INIT_SLOP             79
 #define WE_SET_EARLY_RX_ADJUST_PAUSE          80
+#define WE_SET_MC_RATE                        81
 
 /* Private ioctls and their sub-ioctls */
 #define WLAN_PRIV_SET_NONE_GET_INT    (SIOCIWFIRSTPRIV + 1)
@@ -4659,6 +4660,11 @@ static int iw_setint_getnone(struct net_device *dev, struct iw_request_info *inf
            }
            break;
         }
+        case WE_SET_MC_RATE:
+        {
+            ret = wlan_hdd_set_mc_rate(pAdapter, set_value);
+            break;
+        }
         case WE_SET_TX_POWER:
         {
            tSirMacAddr bssid;
@@ -9673,6 +9679,11 @@ static const struct iw_priv_args we_private_args[] = {
         0,
         "setTxPower" },
 
+    {   WE_SET_MC_RATE,
+        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+        0,
+        "setMcRate" },
+
     {   WE_SET_MAX_TX_POWER_2_4,
         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
         0,
diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index 38347ff0076f..1ece3cac3bf4 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -261,6 +261,7 @@ typedef struct sLimTimers
 typedef struct {
     void *pMlmDisassocReq;
     void *pMlmDeauthReq;
+    vos_spin_lock_t deauthDisassocInprogress;
 }tLimDisassocDeauthCnfReq;
 
 typedef struct sAniSirLim
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index f8ecf8a441c8..9a736e8416a3 100644
--- a/CORE/MAC/inc/qwlan_version.h
+++ b/CORE/MAC/inc/qwlan_version.h
@@ -42,9 +42,9 @@ BRIEF DESCRIPTION:
 #define QWLAN_VERSION_MINOR            0
 #define QWLAN_VERSION_PATCH            0
 #define QWLAN_VERSION_EXTRA            ""
-#define QWLAN_VERSION_BUILD            44
+#define QWLAN_VERSION_BUILD            46
 
-#define QWLAN_VERSIONSTR               "1.0.0.44"
+#define QWLAN_VERSIONSTR               "1.0.0.46"
 
 #ifdef QCA_WIFI_2_0
 
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index bf3addb287ff..c0285bf980d2 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -1037,6 +1037,13 @@ tSirRetStatus peOpen(tpAniSirGlobal pMac, tMacOpenParameters *pMacOpenParam)
         PELOGE(limLog(pMac, LOGE, FL("pe lock init failed!"));)
         return eSIR_FAILURE;
     }
+
+    if (!VOS_IS_STATUS_SUCCESS(
+        vos_spin_lock_init(&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+    {
+        PELOGE(limLog(pMac, LOGE, FL("deauth/disassoc process lock init failed!"));)
+        return eSIR_FAILURE;
+    }
     pMac->lim.deauthMsgCnt = 0;
     return eSIR_SUCCESS;
 }
@@ -1083,6 +1090,12 @@ tSirRetStatus peClose(tpAniSirGlobal pMac)
     {
         return eSIR_FAILURE;
     }
+    if (!VOS_IS_STATUS_SUCCESS(
+        vos_spin_lock_destroy(&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+    {
+        PELOGE(limLog(pMac, LOGE, FL("deauth/disassoc process lock destroy failed!"));)
+        return eSIR_FAILURE;
+    }
     return eSIR_SUCCESS;
 }
 
diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c
index 39aef28670aa..9e1195a19f9e 100644
--- a/CORE/MAC/src/pe/lim/limFT.c
+++ b/CORE/MAC/src/pe/lim/limFT.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -495,6 +495,24 @@ tSirRetStatus limFTPrepareAddBssReq( tpAniSirGlobal pMac,
     }
 
     pAddBssParams->currentOperChannel = bssDescription->channelId;
+    pftSessionEntry->htSecondaryChannelOffset = pAddBssParams->currentExtChannel;
+
+#ifdef WLAN_FEATURE_11AC
+    if (pftSessionEntry->vhtCapability && pftSessionEntry->vhtCapabilityPresentInBeacon)
+    {
+        pAddBssParams->vhtCapable = pBeaconStruct->VHTCaps.present;
+        pAddBssParams->vhtTxChannelWidthSet = pBeaconStruct->VHTOperation.chanWidth;
+        pAddBssParams->currentExtChannel = limGet11ACPhyCBState ( pMac,
+                                                                  pAddBssParams->currentOperChannel,
+                                                                  pAddBssParams->currentExtChannel,
+                                                                  pftSessionEntry->apCenterChan,
+                                                                  pftSessionEntry);
+    }
+    else
+    {
+        pAddBssParams->vhtCapable = 0;
+    }
+#endif
 
 #if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
     limLog( pMac, LOG1, FL( "SIR_HAL_ADD_BSS_REQ with channel = %d..." ),
@@ -525,8 +543,8 @@ tSirRetStatus limFTPrepareAddBssReq( tpAniSirGlobal pMac,
             pAddBssParams->staContext.htCapable = 1;
             pAddBssParams->staContext.greenFieldCapable  = ( tANI_U8 ) pBeaconStruct->HTCaps.greenField;
             pAddBssParams->staContext.lsigTxopProtection = ( tANI_U8 ) pBeaconStruct->HTCaps.lsigTXOPProtection;
-            if( (pBeaconStruct->HTCaps.supportedChannelWidthSet) &&
-                (chanWidthSupp) )
+            if ((pBeaconStruct->HTCaps.supportedChannelWidthSet) &&
+                (chanWidthSupp))
             {
                 pAddBssParams->staContext.txChannelWidthSet = ( tANI_U8 )pBeaconStruct->HTInfo.recommendedTxWidthSet;
             }
@@ -534,6 +552,35 @@ tSirRetStatus limFTPrepareAddBssReq( tpAniSirGlobal pMac,
             {
                 pAddBssParams->staContext.txChannelWidthSet = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
             }                                                           
+#ifdef WLAN_FEATURE_11AC
+            if (pftSessionEntry->vhtCapability && pBeaconStruct->VHTCaps.present)
+            {
+                pAddBssParams->staContext.vhtCapable = 1;
+                if ((pBeaconStruct->VHTCaps.suBeamFormerCap ||
+                     pBeaconStruct->VHTCaps.muBeamformerCap) &&
+                     pftSessionEntry->txBFIniFeatureEnabled)
+                {
+                    pAddBssParams->staContext.vhtTxBFCapable = 1;
+                }
+            }
+#endif
+            if ((pBeaconStruct->HTCaps.supportedChannelWidthSet) &&
+                (chanWidthSupp))
+            {
+                pAddBssParams->staContext.txChannelWidthSet =
+                       (tANI_U8)pBeaconStruct->HTInfo.recommendedTxWidthSet;
+#ifdef WLAN_FEATURE_11AC
+                if (pAddBssParams->staContext.vhtCapable)
+                {
+                    pAddBssParams->staContext.vhtTxChannelWidthSet =
+                        pBeaconStruct->VHTOperation.chanWidth;
+                }
+#endif
+            }
+            else
+            {
+                pAddBssParams->staContext.txChannelWidthSet = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
+            }
             pAddBssParams->staContext.mimoPS             = (tSirMacHTMIMOPowerSaveState)pBeaconStruct->HTCaps.mimoPowerSave;
             pAddBssParams->staContext.delBASupport       = ( tANI_U8 ) pBeaconStruct->HTCaps.delayedBA;
             pAddBssParams->staContext.maxAmsduSize       = ( tANI_U8 ) pBeaconStruct->HTCaps.maximalAMSDUsize;
@@ -564,11 +611,25 @@ tSirRetStatus limFTPrepareAddBssReq( tpAniSirGlobal pMac,
         limPopulatePeerRateSet(pMac, &pAddBssParams->staContext.supportedRates,
                                                     beaconStruct.HTCaps.supportedMCSSet, false,pftSessionEntry);
 #endif
-        limFillSupportedRatesInfo(pMac, NULL, &pAddBssParams->staContext.supportedRates,pftSessionEntry);
-
+        if (pftSessionEntry->htCapability)
+        {
+           pAddBssParams->staContext.supportedRates.opRateMode = eSTA_11n;
+           if (pftSessionEntry->vhtCapability)
+              pAddBssParams->staContext.supportedRates.opRateMode = eSTA_11ac;
+        }
+        else
+        {
+           if (pftSessionEntry->limRFBand == SIR_BAND_5_GHZ)
+           {
+              pAddBssParams->staContext.supportedRates.opRateMode = eSTA_11a;
+           }
+           else
+           {
+              pAddBssParams->staContext.supportedRates.opRateMode = eSTA_11bg;
+           }
+        }
     }
 
-
     //Disable BA. It will be set as part of ADDBA negotiation.
     for( i = 0; i < STACFG_MAX_TC; i++ )
     {
@@ -613,11 +674,13 @@ tSirRetStatus limFTPrepareAddBssReq( tpAniSirGlobal pMac,
 tpPESession limFillFTSession(tpAniSirGlobal pMac,
     tpSirBssDescription  pbssDescription, tpPESession psessionEntry)
 {
-    tpPESession      pftSessionEntry;
-    tANI_U8          currentBssUapsd;
-    tPowerdBm        localPowerConstraint;
-    tPowerdBm        regMax;
-    tSchBeaconStruct *pBeaconStruct;
+    tpPESession       pftSessionEntry;
+    tANI_U8           currentBssUapsd;
+    tPowerdBm         localPowerConstraint;
+    tPowerdBm         regMax;
+    tSchBeaconStruct  *pBeaconStruct;
+    tANI_U32          selfDot11Mode;
+    ePhyChanBondState cbMode;
 
     pBeaconStruct = vos_mem_malloc(sizeof(tSchBeaconStruct));
     if (NULL == pBeaconStruct)
@@ -626,17 +689,11 @@ tpPESession limFillFTSession(tpAniSirGlobal pMac,
         return NULL;
     }
 
-
-       
     /* Retrieve the session that has already been created and update the entry */
     pftSessionEntry = pMac->ft.ftPEContext.pftSessionEntry;
 #if defined WLAN_FEATURE_VOWIFI_11R_DEBUG || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
     limPrintMacAddr(pMac, pbssDescription->bssId, LOG1);
 #endif
-
-    pftSessionEntry->dot11mode = psessionEntry->dot11mode;
-    pftSessionEntry->htCapability = psessionEntry->htCapability;
-
     pftSessionEntry->limWmeEnabled = psessionEntry->limWmeEnabled;
     pftSessionEntry->limQosEnabled = psessionEntry->limQosEnabled;
     pftSessionEntry->limWsmEnabled = psessionEntry->limWsmEnabled;
@@ -665,7 +722,24 @@ tpPESession limFillFTSession(tpAniSirGlobal pMac,
     vos_mem_copy(pftSessionEntry->ssId.ssId, pBeaconStruct->ssId.ssId,
         pftSessionEntry->ssId.length);
 
-
+    wlan_cfgGetInt(pMac, WNI_CFG_DOT11_MODE, &selfDot11Mode);
+    pftSessionEntry->dot11mode = selfDot11Mode;
+    pftSessionEntry->vhtCapability = (IS_DOT11_MODE_VHT(pftSessionEntry->dot11mode)
+                                     && pBeaconStruct->VHTCaps.present);
+    pftSessionEntry->htCapability = (IS_DOT11_MODE_HT(pftSessionEntry->dot11mode)
+                                     && pBeaconStruct->HTCaps.present);
+#ifdef WLAN_FEATURE_11AC
+    if (pBeaconStruct->VHTCaps.present && pBeaconStruct->VHTOperation.present)
+    {
+       pftSessionEntry->vhtCapabilityPresentInBeacon = 1;
+       pftSessionEntry->apCenterChan = pBeaconStruct->VHTOperation.chanCenterFreqSeg1;
+       pftSessionEntry->apChanWidth = pBeaconStruct->VHTOperation.chanWidth;
+    }
+    else
+    {
+       pftSessionEntry->vhtCapabilityPresentInBeacon = 0;
+    }
+#endif
     // Self Mac
     sirCopyMacAddr(pftSessionEntry->selfMacAddr, psessionEntry->selfMacAddr);
     sirCopyMacAddr(pftSessionEntry->limReAssocbssId, pbssDescription->bssId);
@@ -684,7 +758,6 @@ tpPESession limFillFTSession(tpAniSirGlobal pMac,
     pftSessionEntry->limReassocChannelId = pbssDescription->channelId;
     pftSessionEntry->currentOperChannel = pbssDescription->channelId;
             
-            
     if (pftSessionEntry->bssType == eSIR_INFRASTRUCTURE_MODE)
     {
         pftSessionEntry->limSystemRole = eLIM_STA_ROLE;
@@ -740,6 +813,19 @@ tpPESession limFillFTSession(tpAniSirGlobal pMac,
 
     pftSessionEntry->encryptType = psessionEntry->encryptType;
 
+    if (pftSessionEntry->limRFBand == SIR_BAND_2_4_GHZ)
+    {
+        cbMode = pMac->roam.configParam.channelBondingMode24GHz;
+    }
+    else
+    {
+        cbMode = pMac->roam.configParam.channelBondingMode5GHz;
+    }
+    pftSessionEntry->htSupportedChannelWidthSet =
+               cbMode && pBeaconStruct->HTCaps.supportedChannelWidthSet;
+    pftSessionEntry->htRecommendedTxWidthSet =
+               pftSessionEntry->htSupportedChannelWidthSet;
+
     vos_mem_free(pBeaconStruct);
     return pftSessionEntry;
 }
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index dbaff4401a64..4b1f08072cd4 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -2923,7 +2923,21 @@ limProcessMlmDisassocReqNtf(tpAniSirGlobal pMac, eHalStatus suspendStatus, tANI_
                                  psessionEntry, FALSE);
 
              /* Send Disassoc CNF and receive path cleanup */
+             if (!VOS_IS_STATUS_SUCCESS(vos_spin_lock_acquire
+                 (&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+             {
+                 PELOGE(limLog(pMac, LOGE, FL
+                     ("deauth/disassoc process lock aquire failed!"));)
+                 return;
+             }
              limSendDisassocCnf(pMac);
+             if (!VOS_IS_STATUS_SUCCESS(vos_spin_lock_release
+                 (&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+             {
+                 PELOGE(limLog(pMac, LOGE, FL
+                     ("deauth/disassoc process lock release failed!"));)
+                 return;
+             }
         }
         else
         {
@@ -3048,7 +3062,21 @@ void limCleanUpDisassocDeauthReq(tpAniSirGlobal pMac,
 
 void limProcessDisassocAckTimeout(tpAniSirGlobal pMac)
 {
+    if (!VOS_IS_STATUS_SUCCESS(vos_spin_lock_acquire
+         (&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+    {
+        PELOGE(limLog(pMac, LOGE, FL
+                     ("deauth/disassoc process lock aquire failed!"));)
+        return;
+    }
     limSendDisassocCnf(pMac);
+    if (!VOS_IS_STATUS_SUCCESS(vos_spin_lock_release
+         (&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+    {
+        PELOGE(limLog(pMac, LOGE, FL
+                     ("deauth/disassoc process lock release failed!"));)
+        return;
+    }
 }
 
 /**
@@ -3327,7 +3355,21 @@ end:
 
 void limProcessDeauthAckTimeout(tpAniSirGlobal pMac)
 {
+    if (!VOS_IS_STATUS_SUCCESS(vos_spin_lock_acquire
+         (&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+    {
+        PELOGE(limLog(pMac, LOGE, FL
+                     ("deauth/disassoc process lock aquire failed!"));)
+        return;
+    }
     limSendDeauthCnf(pMac);
+    if (!VOS_IS_STATUS_SUCCESS(vos_spin_lock_release
+         (&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+    {
+        PELOGE(limLog(pMac, LOGE, FL
+                     ("deauth/disassoc process lock release failed!"));)
+        return;
+    }
 }
 
 /**
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index 518a33c53632..b39f95407623 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -2727,6 +2727,8 @@ limProcessStaMlmAddBssRspFT(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, tpPESession
     tpAddStaParams pAddStaParams = NULL;
     tANI_U32 listenInterval = WNI_CFG_LISTEN_INTERVAL_STADEF;
     tpAddBssParams pAddBssParams = (tpAddBssParams) limMsgQ->bodyptr;
+    tANI_U32 selfStaDot11Mode = 0;
+
     /* Sanity Checks */
 
     if (pAddBssParams == NULL)
@@ -2844,6 +2846,10 @@ limProcessStaMlmAddBssRspFT(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, tpPESession
     if( psessionEntry->htCapability)
     {
         pAddStaParams->htCapable = psessionEntry->htCapability;
+#ifdef WLAN_FEATURE_11AC
+        pAddStaParams->vhtCapable = psessionEntry->vhtCapability;
+        pAddStaParams->vhtTxChannelWidthSet = psessionEntry->vhtTxChannelWidthSet;
+#endif
 #ifdef DISABLE_GF_FOR_INTEROP
         /*
          * To resolve the interop problem with Broadcom AP,
@@ -2860,7 +2866,16 @@ limProcessStaMlmAddBssRspFT(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, tpPESession
 #endif
 
         pAddStaParams->greenFieldCapable = limGetHTCapability( pMac, eHT_GREENFIELD, psessionEntry);
-        pAddStaParams->txChannelWidthSet = limGetHTCapability( pMac, eHT_SUPPORTED_CHANNEL_WIDTH_SET, psessionEntry);
+        if (psessionEntry->limRFBand == SIR_BAND_2_4_GHZ)
+        {
+            pAddStaParams->txChannelWidthSet =
+                     pMac->roam.configParam.channelBondingMode24GHz;
+        }
+        else
+        {
+            pAddStaParams->txChannelWidthSet =
+                     pMac->roam.configParam.channelBondingMode5GHz;
+        }
         pAddStaParams->mimoPS            = limGetHTCapability( pMac, eHT_MIMO_POWER_SAVE, psessionEntry );
         pAddStaParams->rifsMode          = limGetHTCapability( pMac, eHT_RIFS_MODE, psessionEntry );
         pAddStaParams->lsigTxopProtection = limGetHTCapability( pMac, eHT_LSIG_TXOP_PROTECTION, psessionEntry );
@@ -2877,8 +2892,8 @@ limProcessStaMlmAddBssRspFT(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, tpPESession
         limLog(pMac, LOGP, FL("Couldn't get LISTEN_INTERVAL"));
     pAddStaParams->listenInterval = (tANI_U16)listenInterval;
 
-    limFillSupportedRatesInfo(pMac, NULL, &pAddStaParams->supportedRates,psessionEntry);
-
+    wlan_cfgGetInt(pMac, WNI_CFG_DOT11_MODE, &selfStaDot11Mode);
+    pAddStaParams->supportedRates.opRateMode = limGetStaRateMode((tANI_U8)selfStaDot11Mode);
     // Lets save this for when we receive the Reassoc Rsp
     pMac->ft.ftPEContext.pAddStaReq = pAddStaParams;
 
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index ba810514221a..fede7f85bdce 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -638,6 +638,7 @@ tSirRetStatus limSendTdlsDisReqFrame(tpAniSirGlobal pMac, tSirMacAddr peer_mac,
     LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, ("[TDLS] action %d (%s) -AP-> OTA "),
             SIR_MAC_TDLS_DIS_REQ, limTraceTdlsActionString(SIR_MAC_TDLS_DIS_REQ) ));
 
+    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
     halstatus = halTxFrameWithTxComplete( pMac, pPacket, ( tANI_U16 ) nBytes,
                             HAL_TXRX_FRM_802_11_DATA,
                             ANI_TXDIR_TODS,
@@ -652,7 +653,6 @@ tSirRetStatus limSendTdlsDisReqFrame(tpAniSirGlobal pMac, tSirMacAddr peer_mac,
         limLog( pMac, LOGE, FL("could not send TDLS Dis Request frame!" ));
         return eSIR_FAILURE;
     }
-    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
 
     return eSIR_SUCCESS;
 
@@ -1150,6 +1150,7 @@ static tSirRetStatus limSendTdlsDisRspFrame(tpAniSirGlobal pMac,
             SIR_MAC_TDLS_DIS_RSP, limTraceTdlsActionString(SIR_MAC_TDLS_DIS_RSP) ));
 
 
+    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
     /*
      * Transmit Discovery response and watch if this is delivered to
      * peer STA.
@@ -1181,7 +1182,6 @@ static tSirRetStatus limSendTdlsDisRspFrame(tpAniSirGlobal pMac,
         limLog( pMac, LOGE, FL("could not send TDLS Dis Request frame!" ));
         return eSIR_FAILURE;
     }
-    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
 
     return eSIR_SUCCESS;
 
@@ -1427,6 +1427,7 @@ tSirRetStatus limSendTdlsLinkSetupReqFrame(tpAniSirGlobal pMac,
     LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, ("[TDLS] action %d (%s) -AP-> OTA"),
             SIR_MAC_TDLS_SETUP_REQ, limTraceTdlsActionString(SIR_MAC_TDLS_SETUP_REQ) ));
 
+    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
     halstatus = halTxFrameWithTxComplete( pMac, pPacket, ( tANI_U16 ) nBytes,
                             HAL_TXRX_FRM_802_11_DATA,
                             ANI_TXDIR_TODS,
@@ -1442,7 +1443,6 @@ tSirRetStatus limSendTdlsLinkSetupReqFrame(tpAniSirGlobal pMac,
         limLog( pMac, LOGE, FL("could not send TDLS Dis Request frame!" ));
         return eSIR_FAILURE;
     }
-    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
 
     return eSIR_SUCCESS;
 
@@ -1632,6 +1632,7 @@ tSirRetStatus limSendTdlsTeardownFrame(tpAniSirGlobal pMac,
          SIR_MAC_TDLS_TEARDOWN, limTraceTdlsActionString(SIR_MAC_TDLS_TEARDOWN),
          (reason == eSIR_MAC_TDLS_TEARDOWN_PEER_UNREACHABLE) ? "AP": "DIRECT" ));
 
+    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
     halstatus = halTxFrameWithTxComplete( pMac, pPacket, ( tANI_U16 ) nBytes,
                             HAL_TXRX_FRM_802_11_DATA,
                             ANI_TXDIR_TODS,
@@ -1647,7 +1648,6 @@ tSirRetStatus limSendTdlsTeardownFrame(tpAniSirGlobal pMac,
         return eSIR_FAILURE;
 
     }
-    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
     return eSIR_SUCCESS;
 
 }
@@ -1852,6 +1852,7 @@ static tSirRetStatus limSendTdlsSetupRspFrame(tpAniSirGlobal pMac,
     LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, ("[TDLS] action %d (%s) -AP-> OTA"),
          SIR_MAC_TDLS_SETUP_RSP, limTraceTdlsActionString(SIR_MAC_TDLS_SETUP_RSP) ));
 
+    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
     halstatus = halTxFrameWithTxComplete( pMac, pPacket, ( tANI_U16 ) nBytes,
                             HAL_TXRX_FRM_802_11_DATA,
                             ANI_TXDIR_TODS,
@@ -1867,7 +1868,6 @@ static tSirRetStatus limSendTdlsSetupRspFrame(tpAniSirGlobal pMac,
         limLog( pMac, LOGE, FL("could not send TDLS Dis Request frame!" ));
         return eSIR_FAILURE;
     }
-    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
 
     return eSIR_SUCCESS;
 
@@ -2086,6 +2086,7 @@ tSirRetStatus limSendTdlsLinkSetupCnfFrame(tpAniSirGlobal pMac, tSirMacAddr peer
     LIM_LOG_TDLS(VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, ("[TDLS] action %d (%s) -AP-> OTA"),
          SIR_MAC_TDLS_SETUP_CNF, limTraceTdlsActionString(SIR_MAC_TDLS_SETUP_CNF) ));
 
+    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
     halstatus = halTxFrameWithTxComplete( pMac, pPacket, ( tANI_U16 ) nBytes,
                             HAL_TXRX_FRM_802_11_DATA,
                             ANI_TXDIR_TODS,
@@ -2103,7 +2104,6 @@ tSirRetStatus limSendTdlsLinkSetupCnfFrame(tpAniSirGlobal pMac, tSirMacAddr peer
         return eSIR_FAILURE;
 
     }
-    pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
 
     return eSIR_SUCCESS;
 }
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index 1323c02561cb..48bf8fa81510 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -3650,12 +3650,46 @@ end:
 
 eHalStatus limDisassocTxCompleteCnf(tpAniSirGlobal pMac, tANI_U32 txCompleteSuccess)
 {
-    return limSendDisassocCnf(pMac);
+    eHalStatus status = eHAL_STATUS_FAILURE;
+
+    if (!VOS_IS_STATUS_SUCCESS(vos_spin_lock_acquire
+         (&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+    {
+        PELOGE(limLog(pMac, LOGE, FL
+                     ("deauth/disassoc process lock aquire failed!"));)
+        return status;
+    }
+    status = limSendDisassocCnf(pMac);
+    if (!VOS_IS_STATUS_SUCCESS(vos_spin_lock_release
+         (&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+    {
+        PELOGE(limLog(pMac, LOGE, FL
+                     ("deauth/disassoc process lock release failed!"));)
+        return eHAL_STATUS_FAILURE;
+    }
+    return status;
 }
 
 eHalStatus limDeauthTxCompleteCnf(tpAniSirGlobal pMac, tANI_U32 txCompleteSuccess)
 {
-    return limSendDeauthCnf(pMac);
+    eHalStatus status = eHAL_STATUS_FAILURE;
+
+    if (!VOS_IS_STATUS_SUCCESS(vos_spin_lock_acquire
+         (&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+    {
+        PELOGE(limLog(pMac, LOGE, FL
+                     ("deauth/disassoc process lock aquire failed!"));)
+        return status;
+    }
+    status = limSendDeauthCnf(pMac);
+    if (!VOS_IS_STATUS_SUCCESS(vos_spin_lock_release
+         (&pMac->lim.limDisassocDeauthCnfReq.deauthDisassocInprogress)))
+    {
+        PELOGE(limLog(pMac, LOGE, FL
+                     ("deauth/disassoc process lock release failed!"));)
+        return eHAL_STATUS_FAILURE;
+    }
+    return status;
 }
 
 /**
diff --git a/CORE/SERVICES/BMI/ar6320v2_dbg_regtable.h b/CORE/SERVICES/BMI/ar6320v2_dbg_regtable.h
new file mode 100644
index 000000000000..c33f0dfacdcd
--- /dev/null
+++ b/CORE/SERVICES/BMI/ar6320v2_dbg_regtable.h
@@ -0,0 +1,304 @@
+/*
+ * Copyright (c) 2014 Qualcomm Atheros, Inc.
+ * All Rights Reserved.
+ * Qualcomm Atheros Confidential and Proprietary.
+ */
+
+#ifndef _AR6320V2_DBG_REGTABLE_H_
+#define _AR6320V2_DBG_REGTABLE_H_
+
+#include "regtable.h"
+
+#define AR6320_REV2_1_REG_SIZE 0x0007F820
+
+/*
+ * Redefine the register list. To minimize the size of the array, the list must
+ * obey the below format. {start0, end0}, {start1, end1}, {start2, end2}.......
+ * The value below must obey to "start0 < end0 < start1 < end1 < start2 < ...",
+ * otherwise we may encouter error in the dump processing.
+ */
+
+static const tgt_reg_section ar6320v2_reg_table[] =
+{
+	{0x800, 0x810},
+	{0x820, 0x82C},
+	{0x830, 0x8F4},
+	{0x90C, 0x91C},
+	{0xA14, 0xA18},
+	{0xA84, 0xA94},
+	{0xAA8, 0xAD4},
+	{0xADC, 0xB40},
+	{0x1000, 0x10A4},
+	{0x10BC, 0x111C},
+	{0x1134, 0x1138},
+	{0x1144, 0x114C},
+	{0x1150, 0x115C},
+	{0x1160, 0x1178},
+	{0x1240, 0x1260},
+	{0x2000, 0x207C},
+	{0x3000, 0x3014},
+	{0x4000, 0x4014},
+	{0x5000, 0x5124},
+	{0x6000, 0x6040},
+	{0x6080, 0x60CC},
+	{0x6100, 0x611C},
+	{0x6140, 0x61D8},
+	{0x6200, 0x6238},
+	{0x6240, 0x628C},
+	{0x62C0, 0x62EC},
+	{0x6380, 0x63E8},
+	{0x6400, 0x6440},
+	{0x6480, 0x64CC},
+	{0x6500, 0x651C},
+	{0x6540, 0x6580},
+	{0x6600, 0x6638},
+	{0x6640, 0x668C},
+	{0x66C0, 0x66EC},
+	{0x6780, 0x67E8},
+	{0x7080, 0x708C},
+	{0x70C0, 0x70C8},
+	{0x7400, 0x741C},
+	{0x7440, 0x7454},
+
+	{0x7800, 0x7818},
+	{0x8000, 0x8004},
+	{0x8010, 0x8064},
+	{0x8080, 0x8084},
+	{0x80A0, 0x80A4},
+	{0x80C0, 0x80C4},
+	{0x80E0, 0x80F4},
+	{0x8100, 0x8104},
+	{0x8110, 0x812C},
+	{0x9000, 0x9004},
+	{0x9800, 0x982C},
+	{0x9830, 0x9838},
+	{0x9840, 0x986C},
+	{0x9870, 0x9898},
+	{0x9A00, 0x9C00},
+
+	{0xD580, 0xD59C},
+
+	{0xF000, 0xF0E0},
+	{0xF140, 0xF190},
+	{0xF250, 0xF25C},
+	{0xF260, 0xF268},
+	{0xF26C, 0xF2A8},
+	{0x10008, 0x1000C},
+	{0x10014, 0x10018},
+	{0x1001C, 0x10020},
+	{0x10024, 0x10028},
+	{0x10030, 0x10034},
+	{0x10040, 0x10054},
+	{0x10058, 0x1007C},
+	{0x10080, 0x100C4},
+	{0x100C8, 0x10114},
+	{0x1012C, 0x10130},
+	{0x10138, 0x10144},
+	{0x10200, 0x10220},
+	{0x10230, 0x10250},
+	{0x10260, 0x10280},
+	{0x10290, 0x102B0},
+	{0x102C0, 0x102DC},
+	{0x102E0, 0x102F4},
+	{0x102FC, 0x1037C},
+	{0x10380, 0x10390},
+	{0x10800, 0x10828},
+	{0x10840, 0x10844},
+	{0x10880, 0x10884},
+	{0x108C0, 0x108E8},
+	{0x10900, 0x10928},
+	{0x10940, 0x10944},
+	{0x10980, 0x10984},
+	{0x109C0, 0x109E8},
+	{0x10A00, 0x10A28},
+	{0x10A40, 0x10A50},
+	{0x11000, 0x11028},
+	{0x11030, 0x11034},
+	{0x11038, 0x11068},
+	{0x11070, 0x11074},
+	{0x11078, 0x110A8},
+	{0x110B0, 0x110B4},
+	{0x110B8, 0x110E8},
+	{0x110F0, 0x110F4},
+	{0x110F8, 0x11128},
+	{0x11138, 0x11144},
+	{0x11178, 0x11180},
+	{0x111B8, 0x111C0},
+	{0x111F8, 0x11200},
+	{0x11238, 0x1123C},
+	{0x11270, 0x11274},
+	{0x11278, 0x1127C},
+	{0x112B0, 0x112B4},
+	{0x112B8, 0x112BC},
+	{0x112F0, 0x112F4},
+	{0x112F8, 0x112FC},
+	{0x11338, 0x1133C},
+	{0x11378, 0x1137C},
+	{0x113B8, 0x113BC},
+	{0x113F8, 0x113FC},
+	{0x11438, 0x11440},
+	{0x11478, 0x11480},
+	{0x114B8, 0x114BC},
+	{0x114F8, 0x114FC},
+	{0x11538, 0x1153C},
+	{0x11578, 0x1157C},
+	{0x115B8, 0x115BC},
+	{0x115F8, 0x115FC},
+	{0x11638, 0x1163C},
+	{0x11678, 0x1167C},
+	{0x116B8, 0x116BC},
+	{0x116F8, 0x116FC},
+	{0x11738, 0x1173C},
+	{0x11778, 0x1177C},
+	{0x117B8, 0x117BC},
+	{0x117F8, 0x117FC},
+
+	{0x17000, 0x1701C},
+	{0x17020, 0x170AC},
+
+	{0x18000, 0x18050},
+	{0x18054, 0x18074},
+	{0x18080, 0x180D4},
+	{0x180DC, 0x18104},
+	{0x18108, 0x1813C},
+	{0x18144, 0x18148},
+	{0x18168, 0x18174},
+	{0x18178, 0x18180},
+	{0x181C8, 0x181E0},
+	{0x181E4, 0x181E8},
+	{0x181EC, 0x1820C},
+	{0x1825C, 0x18280},
+	{0x18284, 0x18290},
+	{0x18294, 0x182A0},
+	{0x18300, 0x18304},
+	{0x18314, 0x18320},
+	{0x18328, 0x18350},
+	{0x1835C, 0x1836C},
+	{0x18370, 0x18390},
+	{0x18398, 0x183AC},
+	{0x183BC, 0x183D8},
+	{0x183DC, 0x183F4},
+	{0x18400, 0x186F4},
+	{0x186F8, 0x1871C},
+	{0x18720, 0x18790},
+
+
+	{0x19800, 0x19830},
+	{0x19834, 0x19840},
+	{0x19880, 0x1989C},
+	{0x198A4, 0x198B0},
+	{0x198BC, 0x19900},
+	{0x19C00, 0x19C88},
+	{0x19D00, 0x19D20},
+	{0x19E00, 0x19E7C},
+	{0x19E80, 0x19E94},
+	{0x19E98, 0x19EAC},
+	{0x19EB0, 0x19EBC},
+	{0x19F70, 0x19F74},
+	{0x19F80, 0x19F8C},
+	{0x19FA0, 0x19FB4},
+	{0x19FC0, 0x19FD8},
+	{0x1A000, 0x1A200},
+	{0x1A204, 0x1A210},
+	{0x1A228, 0x1A22C},
+	{0x1A230, 0x1A248},
+	{0x1A250, 0x1A270},
+	{0x1A280, 0x1A290},
+	{0x1A2A0, 0x1A2A4},
+	{0x1A2C0, 0x1A2EC},
+	{0x1A300, 0x1A3BC},
+	{0x1A3F0, 0x1A3F4},
+	{0x1A3F8, 0x1A434},
+	{0x1A438, 0x1A444},
+	{0x1A448, 0x1A468},
+	{0x1A580, 0x1A58C},
+	{0x1A644, 0x1A654},
+	{0x1A670, 0x1A698},
+	{0x1A6AC, 0x1A6B0},
+	{0x1A6D0, 0x1A6D4},
+	{0x1A6EC, 0x1A70C},
+	{0x1A710, 0x1A738},
+	{0x1A7C0, 0x1A7D0},
+	{0x1A7D4, 0x1A7D8},
+	{0x1A7DC, 0x1A7E4},
+	{0x1A7F0, 0x1A7F8},
+	{0x1A888, 0x1A89C},
+	{0x1A8A8, 0x1A8AC},
+	{0x1A8C0, 0x1A8DC},
+	{0x1A8F0, 0x1A8FC},
+	{0x1AE04, 0x1AE08},
+	{0x1AE18, 0x1AE24},
+	{0x1AF80, 0x1AF8C},
+	{0x1AFA0, 0x1AFB4},
+	{0x1B000, 0x1B200},
+	{0x1B284, 0x1B288},
+	{0x1B2D0, 0x1B2D8},
+	{0x1B2DC, 0x1B2EC},
+	{0x1B300, 0x1B340},
+	{0x1B374, 0x1B378},
+	{0x1B380, 0x1B384},
+	{0x1B388, 0x1B38C},
+	{0x1B404, 0x1B408},
+	{0x1B420, 0x1B428},
+	{0x1B440, 0x1B444},
+	{0x1B448, 0x1B44C},
+	{0x1B450, 0x1B458},
+	{0x1B45C, 0x1B468},
+	{0x1B584, 0x1B58C},
+	{0x1B68C, 0x1B690},
+	{0x1B6AC, 0x1B6B0},
+	{0x1B7F0, 0x1B7F8},
+	{0x1C800, 0x1CC00},
+	{0x1CE00, 0x1CE04},
+	{0x1CF80, 0x1CF84},
+	{0x1D200, 0x1D800},
+	{0x1E000, 0x20014},
+	{0x20100, 0x20124},
+	{0x21400, 0x217A8},
+	{0x21800, 0x21BA8},
+	{0x21C00, 0x21FA8},
+	{0x22000, 0x223A8},
+	{0x22400, 0x227A8},
+	{0x22800, 0x22BA8},
+	{0x22C00, 0x22FA8},
+	{0x23000, 0x233A8},
+	{0x24000, 0x24034},
+
+	/*
+	 * EFUSE0,1,2 is disabled here
+	 * because it's state may be reset
+	 *
+	 * {0x24800, 0x24804},
+	 * {0x25000, 0x25004},
+	 * {0x25800, 0x25804},
+	 */
+
+	{0x26000, 0x26064},
+	{0x27000, 0x27024},
+	{0x34000, 0x3400C},
+	{0x34400, 0x3445C},
+	{0x34800, 0x3485C},
+	{0x34C00, 0x34C5C},
+	{0x35000, 0x3505C},
+	{0x35400, 0x3545C},
+	{0x35800, 0x3585C},
+	{0x35C00, 0x35C5C},
+	{0x36000, 0x3605C},
+	{0x38000, 0x38064},
+	{0x38070, 0x380E0},
+	{0x3A000, 0x3A064},
+	{0x3C000, 0x3C004},
+	{0x40000, 0x400A4},
+
+	/*
+	 * SI register is skiped here.
+	 * Because it will cause bus hang
+	 *
+	 * {0x50000, 0x50018},
+	 */
+
+	{0x80000, 0x8000C},
+	{0x80010, 0x80020},
+};
+
+#endif /* #ifndef _AR6320V2_DBG_REGTABLE_H_ */
diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c
index 8ca436d645a8..efef26376985 100644
--- a/CORE/SERVICES/BMI/ol_fw.c
+++ b/CORE/SERVICES/BMI/ol_fw.c
@@ -41,6 +41,7 @@
 #include "a_debug.h"
 #include "fw_one_bin.h"
 #include "bin_sig.h"
+#include "ar6320v2_dbg_regtable.h"
 
 #if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC) && defined(CONFIG_CNSS)
 #include <net/cnss.h>
@@ -1040,6 +1041,82 @@ int ol_diag_read(struct ol_softc *scn, u_int8_t *buffer,
 	}
 }
 
+static int ol_ath_get_reg_table(A_UINT32 target_version,
+				tgt_reg_table *reg_table)
+{
+	int section_len = 0;
+
+	if (!reg_table) {
+		ASSERT(0);
+		return section_len;
+	}
+
+	switch (target_version) {
+	case AR6320_REV2_1_VERSION:
+		reg_table->section = (tgt_reg_section *)&ar6320v2_reg_table[0];
+		reg_table->section_size = sizeof(ar6320v2_reg_table)
+					 /sizeof(ar6320v2_reg_table[0]);
+		section_len = AR6320_REV2_1_REG_SIZE;
+		break;
+	default:
+		reg_table->section = (void *)NULL;
+		reg_table->section_size = 0;
+		section_len = 0;
+	}
+
+	return section_len;
+}
+
+static int ol_diag_read_reg_loc(struct ol_softc *scn, u_int8_t *buffer)
+{
+	int i, len, section_len, fill_len;
+	int dump_len, result = 0;
+	tgt_reg_table reg_table;
+	tgt_reg_section *curr_sec, *next_sec;
+
+	section_len = ol_ath_get_reg_table(scn->target_version, &reg_table);
+
+	if (!reg_table.section || !reg_table.section_size || !section_len) {
+		printk(KERN_ERR "%s: failed to get reg table\n", __func__);
+		result = -EIO;
+		goto out;
+	}
+
+	curr_sec = reg_table.section;
+	for (i=0; i<reg_table.section_size; i++) {
+
+		dump_len = curr_sec->end_addr - curr_sec->start_addr;
+		len = ol_diag_read(scn, buffer, curr_sec->start_addr, dump_len);
+
+		if (len != -EIO) {
+			buffer += len;
+			result += len;
+		} else {
+			printk(KERN_ERR "%s: can't read reg 0x%08x len = %d\n",
+			       __func__, curr_sec->start_addr, dump_len);
+			result = -EIO;
+			goto out;
+		}
+
+		if (result < section_len) {
+			next_sec = (tgt_reg_section *)((u_int8_t *)curr_sec
+							+ sizeof(*curr_sec));
+			fill_len = next_sec->start_addr - curr_sec->end_addr;
+			if (fill_len) {
+				adf_os_mem_set(buffer,
+					       INVALID_REG_LOC_DUMMY_DATA,
+					       fill_len);
+				buffer += fill_len;
+				result += fill_len;
+			}
+		}
+		curr_sec++;
+	}
+
+out:
+	return result;
+}
+
 /**---------------------------------------------------------------------------
  *   \brief  ol_target_coredump
  *
@@ -1071,12 +1148,16 @@ int ol_target_coredump(void *inst, void *memoryBlock, u_int32_t blockLength)
 	* START   = 0x00980000
 	* LENGTH  = 0x00038000
 	*
+	* SECTION = REG
+	* START   = 0x00000800
+	* LENGTH  = 0x0007F820
+	*
 	* SECTION = AXI
 	* START   = 0x000a0000
 	* LENGTH  = 0x00018000
 	*/
 
-	while ((sectionCount < 2) && (amountRead < blockLength)) {
+	while ((sectionCount < 3) && (amountRead < blockLength)) {
 		switch (sectionCount) {
 		case 0:
 			/* DRAM SECTION */
@@ -1089,6 +1170,10 @@ int ol_target_coredump(void *inst, void *memoryBlock, u_int32_t blockLength)
 			readLen = IRAM_SIZE;
 			break;
 		case 2:
+			/* REG SECTION */
+			pos = REGISTER_LOCATION;
+			break;
+		case 3:
 			/* AXI SECTION */
 			pos = AXI_LOCATION;
 			readLen = AXI_SIZE;
@@ -1096,8 +1181,12 @@ int ol_target_coredump(void *inst, void *memoryBlock, u_int32_t blockLength)
 		}
 
 		if ((blockLength - amountRead) >= readLen) {
-			result = ol_diag_read(scn, bufferLoc, pos, readLen);
-			if (result != EIO) {
+			if (pos == REGISTER_LOCATION)
+				result = ol_diag_read_reg_loc(scn, bufferLoc);
+			else
+				result = ol_diag_read(scn, bufferLoc,
+						      pos, readLen);
+			if (result != -EIO) {
 				amountRead += result;
 				bufferLoc += result;
 				sectionCount++;
diff --git a/CORE/SERVICES/BMI/ol_fw.h b/CORE/SERVICES/BMI/ol_fw.h
index bfd4b3e5ee5c..4c850cdc088d 100644
--- a/CORE/SERVICES/BMI/ol_fw.h
+++ b/CORE/SERVICES/BMI/ol_fw.h
@@ -38,6 +38,7 @@
 #define AR6320_REV1_VERSION	     0x5000000
 #define AR6320_REV1_1_VERSION	     0x5000001
 #define AR6320_REV1_3_VERSION	     0x5000003
+#define AR6320_REV2_1_VERSION	     0x5010000
 #define QCA_FIRMWARE_FILE            "athwlan.bin"
 #define QCA_UTF_FIRMWARE_FILE        "utf.bin"
 #define QCA_BOARD_DATA_FILE          "fakeboar.bin"
@@ -50,8 +51,16 @@
 #define PEER_DEFAULT_STATS_UPDATE_PERIOD    500
 
 #if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC)
-#define REGISTER_LOCATION       0x00000000
-#define REGISTER_SIZE           0x00000800
+/*
+ * Note that not all the register locations are accessible.
+ * A list of accessible target registers are specified with
+ * their start and end addresses in a table for given target
+ * version. We should NOT access other locations as either
+ * they are invalid locations or host does not have read
+ * access to it or the value of the particular register
+ * read might change
+ */
+#define REGISTER_LOCATION       0x00000800
 
 #define DRAM_LOCATION           0x00400000
 #define DRAM_SIZE               0x00070000
diff --git a/CORE/SERVICES/HIF/PCIe/copy_engine.c b/CORE/SERVICES/HIF/PCIe/copy_engine.c
index 39d95f6f08c0..0cad06ed597b 100644
--- a/CORE/SERVICES/HIF/PCIe/copy_engine.c
+++ b/CORE/SERVICES/HIF/PCIe/copy_engine.c
@@ -885,6 +885,7 @@ CE_per_engine_service(struct hif_pci_softc *sc, unsigned int CE_id)
     unsigned int flags;
     u_int32_t CE_int_status;
     unsigned int more_comp_cnt = 0;
+    unsigned int more_snd_comp_cnt = 0;
     unsigned int sw_idx, hw_idx;
 
     A_TARGET_ACCESS_BEGIN(targid);
@@ -1005,7 +1006,15 @@ more_watermarks:
     }
 
     if (CE_state->send_cb && CE_send_entries_done_nolock(sc, CE_state)) {
-        goto more_completions;
+        if (more_snd_comp_cnt++ < CE_TXRX_COMP_CHECK_THRESHOLD) {
+            goto more_completions;
+        } else {
+            adf_os_print("%s:Potential infinite loop detected during send completion"
+                         "nentries_mask:0x%x sw read_idx:0x%x hw read_idx:0x%x\n",
+                         __func__, CE_state->src_ring->nentries_mask,
+                         CE_state->src_ring->sw_index,
+                         CE_SRC_RING_READ_IDX_GET(targid, CE_state->ctrl_addr));
+        }
     }
 
 
diff --git a/CORE/SERVICES/HIF/PCIe/hif_pci.c b/CORE/SERVICES/HIF/PCIe/hif_pci.c
index bc0a20c1e58d..dffbf87f11bf 100644
--- a/CORE/SERVICES/HIF/PCIe/hif_pci.c
+++ b/CORE/SERVICES/HIF/PCIe/hif_pci.c
@@ -2217,7 +2217,7 @@ HIF_PCIDeviceProbed(hif_handle_t hif_hdl)
 
         /* 1 bank is switched to IRAM, except ROME 1.0 */
         ealloc_value |= ((HI_EARLY_ALLOC_MAGIC << HI_EARLY_ALLOC_MAGIC_SHIFT) & HI_EARLY_ALLOC_MAGIC_MASK);
-	{
+        {
 	     A_UINT8 banks_switched = 1;
 	     A_UINT32 chip_id;
 	     rv = HIFDiagReadAccess(sc->hif_device, CHIP_ID_ADDRESS | RTC_SOC_BASE_ADDRESS, &chip_id);
@@ -2226,17 +2226,23 @@ HIF_PCIDeviceProbed(hif_handle_t hif_hdl)
 		  goto done;
 	     }
 	     if (CHIP_ID_VERSION_GET(chip_id) == 0xD) {
-                 if ((CHIP_ID_REVISION_GET(chip_id) == 0x0) || (CHIP_ID_REVISION_GET(chip_id) == 0x1)
-                     || (CHIP_ID_REVISION_GET(chip_id) == 0x4)) {
-                     /* for ROME 1.0/1.1 and 2.1, 3 banks are switched to IRAM */
+             switch(CHIP_ID_REVISION_GET(chip_id)) {
+             case 0x2: /* ROME 1.3 */
+                 /* 2 banks are switched to IRAM */
+                 banks_switched = 2;
+                 break;
+             case 0x0: /* ROME 1.0 */
+             case 0x1: /* ROME 1.1 */
+             case 0x4: /* ROME 2.1 */
+             case 0x5: /* ROME 2.2 */
+             default:
+                     /* 3 banks are switched to IRAM */
                      banks_switched = 3;
-                 }
-                 else if (CHIP_ID_REVISION_GET(chip_id) == 0x2) {
-                     /* for ROME 1.3, 2 banks are switched to IRAM */
-                     banks_switched = 2;
-                 }
+                     break;
              }
-             ealloc_value |= ((banks_switched << HI_EARLY_ALLOC_IRAM_BANKS_SHIFT) & HI_EARLY_ALLOC_IRAM_BANKS_MASK);
+
+         }
+         ealloc_value |= ((banks_switched << HI_EARLY_ALLOC_IRAM_BANKS_SHIFT) & HI_EARLY_ALLOC_IRAM_BANKS_MASK);
         }
         rv = HIFDiagWriteAccess(sc->hif_device, ealloc_targ_addr, ealloc_value);
         if (rv != A_OK) {
diff --git a/CORE/SERVICES/HIF/PCIe/regtable.h b/CORE/SERVICES/HIF/PCIe/regtable.h
index 87c8d8be0643..75c30633bd9b 100644
--- a/CORE/SERVICES/HIF/PCIe/regtable.h
+++ b/CORE/SERVICES/HIF/PCIe/regtable.h
@@ -635,6 +635,18 @@ typedef struct hostdef_s {
 #define HOST_INT_STATUS_MBOX_DATA_GET(x)        (((x) & HOST_INT_STATUS_MBOX_DATA_MASK) >> HOST_INT_STATUS_MBOX_DATA_LSB)
 #endif
 
+#define INVALID_REG_LOC_DUMMY_DATA 0xAA
+
+typedef struct TGT_REG_SECTION {
+	u_int32_t start_addr;
+	u_int32_t end_addr;
+} tgt_reg_section;
+
+typedef struct TGT_REG_TABLE {
+	tgt_reg_section *section;
+	u_int32_t section_size;
+} tgt_reg_table;
+
 void target_register_tbl_attach(struct hif_pci_softc *sc, u32 target_type);
 void hif_register_tbl_attach(struct hif_pci_softc *sc, u32 hif_type);
 #endif
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index bb5e63de15e0..059babbeda3c 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -9483,10 +9483,6 @@ static void wma_del_tdls_sta(tp_wma_handle wma,
 
 	wma_update_tdls_peer_state(wma, peerStateParams);
 
-	WMA_LOGD("%s: wma_remove_peer for peer: %pM, vdevId: %d",
-	         __func__, peer->mac_addr.raw, del_sta->smesessionId);
-
-	wma_remove_peer(wma, peer->mac_addr.raw, del_sta->smesessionId, peer);
 	del_sta->status = VOS_STATUS_SUCCESS;
 
 send_del_rsp:
@@ -10980,6 +10976,9 @@ VOS_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle,
 {
 	int32_t ret;
 	struct wma_txrx_node *iface = &wma_handle->interfaces[vdev_id];
+	wmi_sta_uapsd_auto_trig_param uapsd_trigger_param;
+	enum uapsd_up user_priority;
+
 	WMA_LOGD("Disable Uapsd per ac vdevId %d ac %d", vdev_id, ac);
 
 	switch (ac) {
@@ -10987,27 +10986,52 @@ VOS_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle,
 			iface->uapsd_cached_val &=
 					~(WMI_STA_PS_UAPSD_AC3_DELIVERY_EN |
 					WMI_STA_PS_UAPSD_AC3_TRIGGER_EN);
+			user_priority = UAPSD_UP_VO;
 			break;
 		case UAPSD_VI:
 			iface->uapsd_cached_val &=
 					~(WMI_STA_PS_UAPSD_AC2_DELIVERY_EN |
 					WMI_STA_PS_UAPSD_AC2_TRIGGER_EN);
+			user_priority = UAPSD_UP_VI;
 			break;
 		case UAPSD_BK:
 			iface->uapsd_cached_val &=
 					~(WMI_STA_PS_UAPSD_AC1_DELIVERY_EN |
 					WMI_STA_PS_UAPSD_AC1_TRIGGER_EN);
+			user_priority = UAPSD_UP_BK;
 			break;
 		case UAPSD_BE:
 			iface->uapsd_cached_val &=
 					~(WMI_STA_PS_UAPSD_AC0_DELIVERY_EN |
 					WMI_STA_PS_UAPSD_AC0_TRIGGER_EN);
+			user_priority = UAPSD_UP_BE;
 			break;
 		default:
 			WMA_LOGE("Invalid AC vdevId %d ac %d", vdev_id, ac);
 			return VOS_STATUS_E_FAILURE;
 	}
 
+	/*
+	 * Disable Auto Trigger Functionality before
+	 * disabling uapsd for a particular AC
+	 */
+	uapsd_trigger_param.wmm_ac = ac;
+	uapsd_trigger_param.user_priority = user_priority;
+	uapsd_trigger_param.service_interval = 0;
+	uapsd_trigger_param.suspend_interval = 0;
+	uapsd_trigger_param.delay_interval = 0;
+
+	ret = wmi_unified_set_sta_uapsd_auto_trig_cmd(wma_handle->wmi_handle,
+					vdev_id,
+					wma_handle->interfaces[vdev_id].bssid,
+					(u_int8_t*)(&uapsd_trigger_param),
+					1);
+	if (ret) {
+		WMA_LOGE("Fail to send auto trig cmd for vdevid %d ret = %d",
+			ret, vdev_id);
+		return VOS_STATUS_E_FAILURE;
+	}
+
 	ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, vdev_id,
 			WMI_STA_PS_PARAM_UAPSD, iface->uapsd_cached_val);
 	if (ret) {
@@ -14196,14 +14220,7 @@ VOS_STATUS wma_process_rate_update_indicate(tp_wma_handle wma,
 	struct wma_txrx_node *intr = wma->interfaces;
 
 	/* Get the vdev id */
-	if (pRateUpdateParams->dev_mode == VOS_STA_SAP_MODE ||
-		pRateUpdateParams->dev_mode == VOS_IBSS_MODE ||
-		pRateUpdateParams->dev_mode == VOS_P2P_GO_MODE)
-	{
-		pdev = wma_find_vdev_by_addr(wma, pRateUpdateParams->bssid, &vdev_id);
-	} else {
-		pdev = wma_find_vdev_by_bssid(wma, pRateUpdateParams->bssid, &vdev_id);
-	}
+	pdev = wma_find_vdev_by_addr(wma, pRateUpdateParams->bssid, &vdev_id);
 	if (!pdev) {
 		WMA_LOGE("vdev handle is invalid for %pM", pRateUpdateParams->bssid);
 		vos_mem_free(pRateUpdateParams);
@@ -14222,6 +14239,9 @@ VOS_STATUS wma_process_rate_update_indicate(tp_wma_handle wma,
 		mbpsx10_rate = pRateUpdateParams->mcastDataRate24GHz;
 		paramId = WMI_VDEV_PARAM_MCAST_DATA_RATE;
 	}
+	WMA_LOGE("%s: dev_id = %d, dev_type = %d, dev_mode = %d, mac = %pM",
+		__func__, vdev_id, intr[vdev_id].type,
+		pRateUpdateParams->dev_mode, pRateUpdateParams->bssid);
 	ret = wma_encode_mc_rate(short_gi, intr[vdev_id].config.chwidth,
 			intr[vdev_id].chanmode, intr[vdev_id].mhz,
 			mbpsx10_rate, pRateUpdateParams->nss, &rate);
@@ -16163,7 +16183,7 @@ static int wma_channel_avoid_evt_handler(void *handle, u_int8_t *event,
 
 	WMA_LOGD("Channel avoid event received with %d ranges", num_freq_ranges);
 	for (freq_range_idx = 0; freq_range_idx < num_freq_ranges; freq_range_idx++) {
-			afr_desc = (wmi_avoid_freq_range_desc *) (param_buf->avd_freq_range
+			afr_desc = (wmi_avoid_freq_range_desc *) ((void *)param_buf->avd_freq_range
 				+ freq_range_idx * sizeof(wmi_avoid_freq_range_desc));
 			WMA_LOGD("range %d: tlv id = %u, start freq = %u,  end freq = %u",
 					freq_range_idx,
@@ -16181,7 +16201,7 @@ static int wma_channel_avoid_evt_handler(void *handle, u_int8_t *event,
 
 	sca_indication->avoid_range_count = num_freq_ranges;
 	for (freq_range_idx = 0; freq_range_idx < num_freq_ranges; freq_range_idx++) {
-		afr_desc = (wmi_avoid_freq_range_desc *) (param_buf->avd_freq_range
+		afr_desc = (wmi_avoid_freq_range_desc *) ((void *)param_buf->avd_freq_range
 			+ freq_range_idx * sizeof(wmi_avoid_freq_range_desc));
 		sca_indication->avoid_freq_range[freq_range_idx].start_freq =
 			afr_desc->start_freq + 10;
@@ -18593,6 +18613,9 @@ static int wma_update_tdls_peer_state(WMA_HANDLE handle,
 	wmi_buf_t wmi_buf;
 	u_int8_t *buf_ptr;
 	u_int32_t i;
+	ol_txrx_pdev_handle pdev;
+	u_int8_t peer_id;
+	struct ol_txrx_peer_t *peer;
 	int32_t len = sizeof(wmi_tdls_peer_update_cmd_fixed_param) +
 	              sizeof(wmi_tdls_peer_capabilities);
 
@@ -18663,6 +18686,29 @@ static int wma_update_tdls_peer_state(WMA_HANDLE handle,
 		adf_nbuf_free(wmi_buf);
 		return -EIO;
 	}
+
+	/* in case of teardown, remove peer from fw */
+	if (WDA_TDLS_PEER_STATE_TEARDOWN == peerStateParams->peerState) {
+		pdev = vos_get_context(VOS_MODULE_ID_TXRX, wma_handle->vos_context);
+		if (!pdev) {
+			WMA_LOGE("%s: Failed to find pdev", __func__);
+			return -EIO;
+		}
+
+		peer = ol_txrx_find_peer_by_addr(pdev, peerStateParams->peerMacAddr,
+		                                 &peer_id);
+		if (!peer) {
+			WMA_LOGE("%s: Failed to get peer handle using peer mac %pM",
+			         __func__, peerStateParams->peerMacAddr);
+			return -EIO;
+		}
+
+		WMA_LOGD("%s: calling wma_remove_peer for peer " MAC_ADDRESS_STR
+		         " vdevId: %d", __func__,
+		         MAC_ADDR_ARRAY(peer->mac_addr.raw), peerStateParams->vdevId);
+		wma_remove_peer(wma_handle, peer->mac_addr.raw,
+		                peerStateParams->vdevId, peer);
+	}
 	return 0;
 }
 #endif /* FEATURE_WLAN_TDLS */
diff --git a/CORE/SERVICES/WMA/wma.h b/CORE/SERVICES/WMA/wma.h
index 23aab4354c81..2933ac73acb9 100644
--- a/CORE/SERVICES/WMA/wma.h
+++ b/CORE/SERVICES/WMA/wma.h
@@ -1464,4 +1464,18 @@ enum uapsd_ac {
 VOS_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle,
 					u_int32_t vdev_id,
 					enum uapsd_ac ac);
+
+/* U-APSD User Priorities */
+enum uapsd_up {
+	UAPSD_UP_BE,
+	UAPSD_UP_BK,
+	UAPSD_UP_RESV,
+	UAPSD_UP_EE,
+	UAPSD_UP_CL,
+	UAPSD_UP_VI,
+	UAPSD_UP_VO,
+	UAPSD_UP_NC,
+	UAPSD_UP_MAX
+};
+
 #endif
diff --git a/CORE/SME/inc/ccmApi.h b/CORE/SME/inc/ccmApi.h
index f5611d7a6e44..af33bd3a89ce 100644
--- a/CORE/SME/inc/ccmApi.h
+++ b/CORE/SME/inc/ccmApi.h
@@ -25,16 +25,16 @@
  * to the Linux Foundation.
  */
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
     \file ccmApi.h
-  
+
     \brief Exports and types for the Common Config Module (CCM)
-  
+
     $Id$This file contains all the interfaces for thge Platform Abstration Layer
-    functions.  It is intended to be included in all modules that are using 
+    functions.  It is intended to be included in all modules that are using
     the PAL interfaces.
-  
+
    ========================================================================== */
 #ifndef CCMAPI_H__
 #define CCMAPI_H__
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 1627170f7494..9644107b3c7b 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -1637,4 +1637,3 @@ eCsrBand csrGetCurrentBand (tHalHandle hHal);
 
 typedef void (*csrReadyToSuspendCallback)(void *pContext);
 #endif
-
diff --git a/CORE/SME/inc/csrLinkList.h b/CORE/SME/inc/csrLinkList.h
index f3feb7163c1c..d7848a555ee1 100644
--- a/CORE/SME/inc/csrLinkList.h
+++ b/CORE/SME/inc/csrLinkList.h
@@ -25,10 +25,10 @@
  * to the Linux Foundation.
  */
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
     \file csrLinkList.h
-  
+
     Exports and types for the Common link list interfaces.
 ========================================================================== */
 #ifndef CSR_LINK_LIST_H__
@@ -70,8 +70,8 @@ typedef struct tagDblLinkList
 #define GET_BASE_ADDR(address, type, field) ((type *)( \
                                                   (tANI_U8 *)(address) - \
                                                   (tANI_U8 *)(&((type *)0)->field)))
-                                     
-//To get the offset of (field) inside structure (type)                                                  
+
+//To get the offset of (field) inside structure (type)
 #define GET_FIELD_OFFSET(type, field)  ((tANI_U32_OR_PTR)(&(((type *)0)->field)))
 
 #define GET_ROUND_UP( _Field, _Boundary ) (((_Field) + ((_Boundary) - 1))  & ~((_Boundary) - 1))
@@ -81,7 +81,7 @@ typedef struct tagDblLinkList
 #define CSR_MAX(a, b)  ((a) > (b) ? (a) : (b))
 #define CSR_MIN(a, b)  ((a) < (b) ? (a) : (b))
 
-                                                  
+
 #define csrIsListEmpty(pHead) ((pHead)->next == (pHead))
 
 tANI_U32 csrLLCount( tDblLinkList *pList );
@@ -116,4 +116,3 @@ tANI_BOOLEAN csrLLFindEntry( tDblLinkList *pList, tListElem *pEntryToFind );
 
 
 #endif
-
diff --git a/CORE/SME/inc/csrNeighborRoam.h b/CORE/SME/inc/csrNeighborRoam.h
index 85345510c8a1..6d53331f84a6 100644
--- a/CORE/SME/inc/csrNeighborRoam.h
+++ b/CORE/SME/inc/csrNeighborRoam.h
@@ -25,13 +25,13 @@
  * to the Linux Foundation.
  */
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
+
 
-  
     \file csrNeighborRoam.h
-  
-    Exports and types for the neighbor roaming algorithm which is sepcifically 
+
+    Exports and types for the neighbor roaming algorithm which is sepcifically
     designed for Android.
 ========================================================================== */
 #ifndef CSR_NEIGHBOR_ROAM_H
@@ -53,7 +53,7 @@ typedef enum
     eCSR_NEIGHBOR_ROAM_STATE_REPORT_SCAN,
     eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING,
     eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE,
-#endif /* WLAN_FEATURE_VOWIFI_11R */    
+#endif /* WLAN_FEATURE_VOWIFI_11R */
     eNEIGHBOR_STATE_MAX
 } eCsrNeighborRoamState;
 
@@ -126,9 +126,9 @@ typedef struct sCsr11rAssocNeighborInfo
 } tCsr11rAssocNeighborInfo, *tpCsr11rAssocNeighborInfo;
 #endif /* WLAN_FEATURE_VOWIFI_11R */
 
-/* Below macros are used to increase the registered neighbor Lookup threshold with TL when 
- * we dont see any AP during back ground scanning. The values are incremented from neighborLookupThreshold 
- * from CFG, incremented by 5,10,15...50(LOOKUP_THRESHOLD_INCREMENT_MULTIPLIER_MAX * 
+/* Below macros are used to increase the registered neighbor Lookup threshold with TL when
+ * we dont see any AP during back ground scanning. The values are incremented from neighborLookupThreshold
+ * from CFG, incremented by 5,10,15...50(LOOKUP_THRESHOLD_INCREMENT_MULTIPLIER_MAX *
  * NEIGHBOR_LOOKUP_THRESHOLD_INCREMENT_CONSTANT) */
 #define NEIGHBOR_LOOKUP_THRESHOLD_INCREMENT_CONSTANT    5
 #define LOOKUP_THRESHOLD_INCREMENT_MULTIPLIER_MAX       4
@@ -178,11 +178,11 @@ typedef struct sCsrNeighborRoamControlInfo
     tDblLinkList                roamableAPList;    // List of current FT candidates
     tANI_U32                    csrSessionId;
     tCsrRoamProfile             csrNeighborRoamProfile;
-#ifdef WLAN_FEATURE_VOWIFI_11R    
+#ifdef WLAN_FEATURE_VOWIFI_11R
     tANI_BOOLEAN                is11rAssoc;
     tCsr11rAssocNeighborInfo    FTRoamInfo;
 #endif /* WLAN_FEATURE_VOWIFI_11R */
-#ifdef FEATURE_WLAN_CCX    
+#ifdef FEATURE_WLAN_CCX
     tANI_BOOLEAN                isCCXAssoc;
     tANI_BOOLEAN                isVOAdmitted;
     tANI_U32                    MinQBssLoadRequired;
@@ -298,4 +298,3 @@ VOS_STATUS csrRoamReadTSF(tpAniSirGlobal pMac, tANI_U8 *pTimestamp);
 #endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */
 
 #endif /* CSR_NEIGHBOR_ROAM_H */
-
diff --git a/CORE/SME/inc/csrSupport.h b/CORE/SME/inc/csrSupport.h
index 64d668579ef6..bf63b4a373e4 100644
--- a/CORE/SME/inc/csrSupport.h
+++ b/CORE/SME/inc/csrSupport.h
@@ -88,11 +88,11 @@
 #define CSR_DOT11_MIN_11G_RATE (  6 * 2 )
 
 //Define the frequency ranges that need to be passive scan, MHz
-#define CSR_PASSIVE_SCAN_CAT1_LOW       5250 
+#define CSR_PASSIVE_SCAN_CAT1_LOW       5250
 #define CSR_PASSIVE_SCAN_CAT1_HIGH      5350
-#define CSR_PASSIVE_SCAN_CAT2_LOW       5470 
+#define CSR_PASSIVE_SCAN_CAT2_LOW       5470
 #define CSR_PASSIVE_SCAN_CAT2_HIGH      5725
-#define CSR_PASSIVE_SCAN_CAT3_LOW       5500 
+#define CSR_PASSIVE_SCAN_CAT3_LOW       5500
 #define CSR_PASSIVE_SCAN_CAT3_HIGH      5560
 
 #define CSR_OUI_USE_GROUP_CIPHER_INDEX 0x00
@@ -109,7 +109,7 @@
 #endif /* FEATURE_WLAN_WAPI */
 
 
-typedef enum 
+typedef enum
 {
     // 11b rates
     eCsrSuppRate_1Mbps   =   1 * 2,
@@ -201,7 +201,7 @@ typedef enum
     eCSR_COUNTRY_INDEX_BOTSWANA,
     eCSR_COUNTRY_INDEX_BELARUS,
     eCSR_COUNTRY_INDEX_BELIZE,
-    eCSR_COUNTRY_INDEX_CANADA,      
+    eCSR_COUNTRY_INDEX_CANADA,
     eCSR_COUNTRY_INDEX_COCOS_KEELING_ISLANDS,
     eCSR_COUNTRY_INDEX_CONGO_REP,
     eCSR_COUNTRY_INDEX_CENTRAL_AFRICAN,
@@ -414,22 +414,22 @@ typedef enum
     eCSR_COUNTRY_INDEX_KOREA_3,
     eCSR_COUNTRY_INDEX_KOREA_4,
 
-    eCSR_NUM_COUNTRY_INDEX,     
+    eCSR_NUM_COUNTRY_INDEX,
 }eCsrCountryIndex;
 //Please donot insert in the middle of the enum above because they tie to the indiex
 
 
-typedef struct tagCsrSirMBMsgHdr 
+typedef struct tagCsrSirMBMsgHdr
 {
     tANI_U16 type;
     tANI_U16 msgLen;
 
 }tCsrSirMBMsgHdr;
 
-typedef struct tagCsrCfgMsgTlvHdr 
+typedef struct tagCsrCfgMsgTlvHdr
 {
     tANI_U32 type;
-    tANI_U32 length;    
+    tANI_U32 length;
 
 }tCsrCfgMsgTlvHdr;
 
@@ -439,10 +439,10 @@ typedef struct tagCsrCfgMsgTlv
 {
     tCsrCfgMsgTlvHdr Hdr;
     tANI_U32 variable[ 1 ];    // placeholder for the data
-    
+
 }tCsrCfgMsgTlv;
 
-typedef struct tagCsrCfgGetRsp 
+typedef struct tagCsrCfgGetRsp
 {
   tCsrSirMBMsgHdr hdr;
   tANI_U32    respStatus;
@@ -451,9 +451,9 @@ typedef struct tagCsrCfgGetRsp
   tANI_U32    attribVal[1];
 }tCsrCfgGetRsp;
 
-typedef struct tagCsrCfgSetRsp 
+typedef struct tagCsrCfgSetRsp
 {
-  
+
   tCsrSirMBMsgHdr hdr;
   tANI_U32    respStatus;
   tANI_U32    paramId;
@@ -475,7 +475,7 @@ typedef struct tagCsrDomainChnScanInfo
 #endif
 
 // Generic Information Element Structure
-typedef __ani_attr_pre_packed struct sDot11IEHeader 
+typedef __ani_attr_pre_packed struct sDot11IEHeader
 {
     tANI_U8 ElementID;
     tANI_U8 Length;
@@ -488,7 +488,7 @@ typedef __ani_attr_pre_packed struct tagCsrWmeInfoIe
     tANI_U8    Subtype;
     tANI_U8    Version;
     tANI_U8    QoSInfo;
-    
+
 } __ani_attr_packed tCsrWmeInfoIe;
 
 typedef __ani_attr_pre_packed struct tagCsrWmeAcParms
@@ -496,7 +496,7 @@ typedef __ani_attr_pre_packed struct tagCsrWmeAcParms
     tANI_U8  AciAifsn;
     tANI_U8  EcwMinEcwMax;
     tANI_U16 TxOpLimit;
-    
+
 } __ani_attr_packed tCsrWmeAcParms;
 
 typedef __ani_attr_pre_packed struct tagCsrWmeParmIe
@@ -511,66 +511,66 @@ typedef __ani_attr_pre_packed struct tagCsrWmeParmIe
     tCsrWmeAcParms   Background;
     tCsrWmeAcParms   Video;
     tCsrWmeAcParms   Voice;
-        
+
 } __ani_attr_packed tCsrWmeParmIe;
 
-typedef __ani_attr_pre_packed struct tagCsrWpaIe 
+typedef __ani_attr_pre_packed struct tagCsrWpaIe
 {
     tDot11IEHeader IeHeader;
     tANI_U8    Oui[ CSR_WPA_OUI_SIZE ];
     tANI_U16   Version;
     tANI_U8    MulticastOui[ CSR_WPA_OUI_SIZE ];
     tANI_U16   cUnicastCyphers;
-    
+
     __ani_attr_pre_packed struct {
-    
+
         tANI_U8 Oui[ CSR_WPA_OUI_SIZE ];
-        
+
     } __ani_attr_packed UnicastOui[ 1 ];
-    
+
 } __ani_attr_packed tCsrWpaIe;
 
-typedef __ani_attr_pre_packed struct tagCsrWpaAuthIe 
+typedef __ani_attr_pre_packed struct tagCsrWpaAuthIe
 {
 
     tANI_U16 cAuthenticationSuites;
-    
+
     __ani_attr_pre_packed struct {
-    
+
         tANI_U8 Oui[ CSR_WPA_OUI_SIZE ];
-    
+
     } __ani_attr_packed AuthOui[ 1 ];
 
 } __ani_attr_packed tCsrWpaAuthIe;
 
 
-typedef __ani_attr_pre_packed struct tagCsrRSNIe 
+typedef __ani_attr_pre_packed struct tagCsrRSNIe
 {
     tDot11IEHeader IeHeader;
     tANI_U16   Version;
     tANI_U8    MulticastOui[ CSR_RSN_OUI_SIZE ];
     tANI_U16   cUnicastCyphers;
-    
+
     __ani_attr_pre_packed struct {
-    
+
         tANI_U8 Oui[ CSR_RSN_OUI_SIZE ];
-        
+
     } __ani_attr_packed UnicastOui[ 1 ];
-    
+
 } __ani_attr_packed tCsrRSNIe;
 
-typedef __ani_attr_pre_packed struct tagCsrRSNAuthIe 
+typedef __ani_attr_pre_packed struct tagCsrRSNAuthIe
 {
     tANI_U16 cAuthenticationSuites;
     __ani_attr_pre_packed struct {
-    
+
         tANI_U8 Oui[ CSR_RSN_OUI_SIZE ];
-    
+
     } __ani_attr_packed AuthOui[ 1 ];
 
 } __ani_attr_packed tCsrRSNAuthIe;
 
-typedef __ani_attr_pre_packed struct tagCsrRSNCapabilities 
+typedef __ani_attr_pre_packed struct tagCsrRSNCapabilities
 {
     tANI_U16 PreAuthSupported:1;
     tANI_U16 NoPairwise:1;
@@ -581,14 +581,14 @@ typedef __ani_attr_pre_packed struct tagCsrRSNCapabilities
     tANI_U16 Reserved:8;
 } __ani_attr_packed tCsrRSNCapabilities;
 
-typedef __ani_attr_pre_packed struct tagCsrRSNPMKIe 
+typedef __ani_attr_pre_packed struct tagCsrRSNPMKIe
 {
     tANI_U16 cPMKIDs;
-    
+
     __ani_attr_pre_packed struct {
-    
+
         tANI_U8 PMKID[ CSR_RSN_PMKID_SIZE ];
-    
+
     } __ani_attr_packed PMKIDList[ 1 ];
 
 
@@ -601,7 +601,7 @@ typedef __ani_attr_pre_packed struct tCsrIELenInfo
 } __ani_attr_packed tCsrIELenInfo;
 
 #ifdef FEATURE_WLAN_WAPI
-typedef __ani_attr_pre_packed struct tagCsrWapiIe 
+typedef __ani_attr_pre_packed struct tagCsrWapiIe
 {
     tDot11IEHeader IeHeader;
     tANI_U16   Version;
@@ -620,7 +620,7 @@ typedef __ani_attr_pre_packed struct tagCsrWapiIe
 
     } __ani_attr_packed UnicastOui[ 1 ];
 
-    tANI_U8    MulticastOui[ CSR_WAPI_OUI_SIZE ];    
+    tANI_U8    MulticastOui[ CSR_WAPI_OUI_SIZE ];
 
     __ani_attr_pre_packed struct {
        tANI_U16 PreAuthSupported:1;
@@ -630,7 +630,7 @@ typedef __ani_attr_pre_packed struct tagCsrWapiIe
 
 } __ani_attr_packed tCsrWapiIe;
 
-typedef __ani_attr_pre_packed struct tagCsrWAPIBKIe 
+typedef __ani_attr_pre_packed struct tagCsrWAPIBKIe
 {
     tANI_U16 cBKIDs;
     __ani_attr_pre_packed struct {
@@ -647,9 +647,9 @@ typedef __ani_attr_pre_packed struct tagCsrWAPIBKIe
 #pragma pack( pop )
 #endif
 
-// Structure used to describe a group of continuous channels and hook it into the 
+// Structure used to describe a group of continuous channels and hook it into the
 // corresponding channel list
-typedef struct tagCsrChannelSet 
+typedef struct tagCsrChannelSet
 {
   tListElem      channelListLink;
   tANI_U8   firstChannel;
@@ -659,14 +659,14 @@ typedef struct tagCsrChannelSet
 }tCsrChannelSet;
 
 
-typedef struct sDot11InfoIBSSParmSet 
+typedef struct sDot11InfoIBSSParmSet
 {
     tDot11IEHeader dot11IEHeader;
     tANI_U8 ATIMWindow;
 }tDot11InfoIBSSParmSet;
 
 
-typedef struct sDot11IECountry 
+typedef struct sDot11IECountry
 {
     tDot11IEHeader dot11IEHeader;
     tANI_U8 countryString[3];
@@ -674,7 +674,7 @@ typedef struct sDot11IECountry
 }tDot11IECountry;
 
 
-typedef struct sDot11IEExtenedSupportedRates 
+typedef struct sDot11IEExtenedSupportedRates
 {
     tDot11IEHeader dot11IEHeader;
     tANI_U8 ExtendedSupportedRates[ CSR_DOT11_EXTENDED_SUPPORTED_RATES_MAX ];
@@ -713,14 +713,14 @@ typedef struct tagRoamingTimerInfo
 //This macro returns the total length needed of Tlv with with len bytes of data
 #define GET_TLV_MSG_LEN(len)    GET_ROUND_UP((sizeof(tCsrCfgMsgTlvHdr) + (len)), sizeof(tANI_U32))
 
-tANI_BOOLEAN csrGetBssIdBssDesc( tHalHandle hHal, tSirBssDescription *pSirBssDesc, tCsrBssid *pBssId ); 
+tANI_BOOLEAN csrGetBssIdBssDesc( tHalHandle hHal, tSirBssDescription *pSirBssDesc, tCsrBssid *pBssId );
 tANI_BOOLEAN csrIsBssIdEqual( tHalHandle hHal, tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2 );
 
 eCsrMediaAccessType csrGetQoSFromBssDesc( tHalHandle hHal, tSirBssDescription *pSirBssDesc,
                                           tDot11fBeaconIEs *pIes);
 tANI_BOOLEAN csrIsNULLSSID( tANI_U8 *pBssSsid, tANI_U8 len );
-tANI_BOOLEAN csrIsInfraBssDesc( tSirBssDescription *pSirBssDesc ); 
-tANI_BOOLEAN csrIsIbssBssDesc( tSirBssDescription *pSirBssDesc ); 
+tANI_BOOLEAN csrIsInfraBssDesc( tSirBssDescription *pSirBssDesc );
+tANI_BOOLEAN csrIsIbssBssDesc( tSirBssDescription *pSirBssDesc );
 tANI_BOOLEAN csrIsPrivacy( tSirBssDescription *pSirBssDesc );
 tSirResultCodes csrGetDisassocRspStatusCode( tSirSmeDisassocRsp *pSmeDisassocRsp );
 tSirResultCodes csrGetDeAuthRspStatusCode( tSirSmeDeauthRsp *pSmeRsp );
@@ -728,9 +728,9 @@ tANI_U32 csrGetFragThresh( tHalHandle hHal );
 tANI_U32 csrGetRTSThresh( tHalHandle hHal );
 eCsrPhyMode csrGetPhyModeFromBssDesc( tSirBssDescription *pSirBssDesc );
 tANI_U32 csrGet11hPowerConstraint( tHalHandle hHal, tDot11fIEPowerConstraints *pPowerConstraint );
-tANI_U8 csrConstructRSNIe( tHalHandle hHal, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+tANI_U8 csrConstructRSNIe( tHalHandle hHal, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                             tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrRSNIe *pRSNIe );
-tANI_U8 csrConstructWpaIe( tHalHandle hHal, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, 
+tANI_U8 csrConstructWpaIe( tHalHandle hHal, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc,
                            tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe );
 #ifdef FEATURE_WLAN_WAPI
 
@@ -738,9 +738,9 @@ tANI_BOOLEAN csrIsProfileWapi( tCsrRoamProfile *pProfile );
 #endif /* FEATURE_WLAN_WAPI */
 //If a WPAIE exists in the profile, just use it. Or else construct one from the BSS
 //Caller allocated memory for pWpaIe and guarrantee it can contain a max length WPA IE
-tANI_U8 csrRetrieveWpaIe( tHalHandle hHal, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, 
+tANI_U8 csrRetrieveWpaIe( tHalHandle hHal, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc,
                           tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe );
-tANI_BOOLEAN csrIsSsidEqual( tHalHandle hHal, tSirBssDescription *pSirBssDesc1, 
+tANI_BOOLEAN csrIsSsidEqual( tHalHandle hHal, tSirBssDescription *pSirBssDesc1,
                              tSirBssDescription *pSirBssDesc2, tDot11fBeaconIEs *pIes2 );
 //Null ssid means match
 tANI_BOOLEAN csrIsSsidInList( tHalHandle hHal, tSirMacSSid *pSsid, tCsrSSIDs *pSsidList );
@@ -751,28 +751,28 @@ tANI_BOOLEAN csrGetWpaRsnIe( tHalHandle hHal, tANI_U8 *pIes, tANI_U32 len,
                              tANI_U8 *pWpaIe, tANI_U8 *pcbWpaIe, tANI_U8 *pRSNIe, tANI_U8 *pcbRSNIe);
 //If a RSNIE exists in the profile, just use it. Or else construct one from the BSS
 //Caller allocated memory for pWpaIe and guarrantee it can contain a max length WPA IE
-tANI_U8 csrRetrieveRsnIe( tHalHandle hHal, tANI_U32 sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, 
+tANI_U8 csrRetrieveRsnIe( tHalHandle hHal, tANI_U32 sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc,
                           tDot11fBeaconIEs *pIes, tCsrRSNIe *pRsnIe );
 #ifdef FEATURE_WLAN_WAPI
 //If a WAPI IE exists in the profile, just use it. Or else construct one from the BSS
 //Caller allocated memory for pWapiIe and guarrantee it can contain a max length WAPI IE
-tANI_U8 csrRetrieveWapiIe( tHalHandle hHal, tANI_U32 sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, 
+tANI_U8 csrRetrieveWapiIe( tHalHandle hHal, tANI_U32 sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc,
                           tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe );
 #endif /* FEATURE_WLAN_WAPI */
 tANI_BOOLEAN csrSearchChannelListForTxPower(tHalHandle hHal, tSirBssDescription *pBssDescription, tCsrChannelSet *returnChannelGroup);
 tANI_BOOLEAN csrRatesIsDot11Rate11bSupportedRate( tANI_U8 dot11Rate );
 tANI_BOOLEAN csrRatesIsDot11Rate11aSupportedRate( tANI_U8 dot11Rate );
-tAniEdType csrTranslateEncryptTypeToEdType( eCsrEncryptionType EncryptType ); 
-//pIes shall contain IEs from pSirBssDesc. It shall be returned from function csrGetParsedBssDescriptionIEs 
+tAniEdType csrTranslateEncryptTypeToEdType( eCsrEncryptionType EncryptType );
+//pIes shall contain IEs from pSirBssDesc. It shall be returned from function csrGetParsedBssDescriptionIEs
 tANI_BOOLEAN csrIsSecurityMatch( tHalHandle hHal, tCsrAuthList *authType, tCsrEncryptionList *pUCEncryptionType, tCsrEncryptionList *pMCEncryptionType,
-                                 tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, 
+                                 tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes,
                                  eCsrAuthType *negotiatedAuthtype, eCsrEncryptionType *negotiatedUCCipher, eCsrEncryptionType *negotiatedMCCipher );
 tANI_BOOLEAN csrIsBSSTypeMatch(eCsrRoamBssType bssType1, eCsrRoamBssType bssType2);
 tANI_BOOLEAN csrIsBssTypeIBSS(eCsrRoamBssType bssType);
 tANI_BOOLEAN csrIsBssTypeWDS(eCsrRoamBssType bssType);
 //ppIes can be NULL. If caller want to get the *ppIes allocated by this function, pass in *ppIes = NULL
 //Caller needs to free the memory in this case
-tANI_BOOLEAN csrMatchBSS( tHalHandle hHal, tSirBssDescription *pBssDesc, tCsrScanResultFilter *pFilter, 
+tANI_BOOLEAN csrMatchBSS( tHalHandle hHal, tSirBssDescription *pBssDesc, tCsrScanResultFilter *pFilter,
                           eCsrAuthType *pNegAuth, eCsrEncryptionType *pNegUc, eCsrEncryptionType *pNegMc,
                           tDot11fBeaconIEs **ppIes);
 
@@ -782,7 +782,7 @@ tANI_BOOLEAN csrMatchBSSToConnectProfile( tHalHandle hHal, tCsrRoamConnectedProf
 tANI_BOOLEAN csrRatesIsDot11RateSupported( tHalHandle hHal, tANI_U8 rate );
 tANI_U16 csrRatesFindBestRate( tSirMacRateSet *pSuppRates, tSirMacRateSet *pExtRates, tSirMacPropRateSet *pPropRates );
 tSirBssType csrTranslateBsstypeToMacType(eCsrRoamBssType csrtype);
-                            
+
 //Caller allocates memory for pIEStruct
 eHalStatus csrParseBssDescriptionIEs(tHalHandle hHal, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIEStruct);
 //This function will allocate memory for the parsed IEs to the caller. Caller must free the memory
@@ -793,7 +793,7 @@ tANI_BOOLEAN csrValidateCountryString( tHalHandle hHal, tANI_U8 *pCountryString
 tSirScanType csrGetScanType(tpAniSirGlobal pMac, tANI_U8 chnId);
 
 tANI_U8 csrToUpper( tANI_U8 ch );
-eHalStatus csrGetPhyModeFromBss(tpAniSirGlobal pMac, tSirBssDescription *pBSSDescription, 
+eHalStatus csrGetPhyModeFromBss(tpAniSirGlobal pMac, tSirBssDescription *pBSSDescription,
                                 eCsrPhyMode *pPhyMode, tDot11fBeaconIEs *pIes);
 
 //fForce -- force reassoc regardless of whether there is any change
@@ -808,7 +808,7 @@ eHalStatus
 csrIsconcurrentsessionValid(tpAniSirGlobal pMac,tANI_U32 cursessionId,
                                  tVOS_CON_MODE currBssPersona);
 
-//Update beaconInterval for P2P-GO case if it is different 
+//Update beaconInterval for P2P-GO case if it is different
 eHalStatus csrUpdatep2pBeaconInterval(tpAniSirGlobal pMac);
 
 //BeaconInterval validation for MCC support
@@ -827,4 +827,3 @@ tANI_BOOLEAN csrIsProfileCCX( tCsrRoamProfile *pProfile );
 #endif
 
 #endif
-
diff --git a/CORE/SME/inc/oemDataApi.h b/CORE/SME/inc/oemDataApi.h
index 7369b746aeea..b3f98365edb3 100644
--- a/CORE/SME/inc/oemDataApi.h
+++ b/CORE/SME/inc/oemDataApi.h
@@ -27,12 +27,12 @@
 
 #ifdef FEATURE_OEM_DATA_SUPPORT
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
+
 
-  
     \file oemDataApi.h
-  
+
     Exports and types for the Common OEM DATA REQ/RSP Module interfaces.
 ========================================================================== */
 
@@ -94,7 +94,7 @@ typedef enum
 /* ---------------------------------------------------------------------------
     \fn oemData_OemDataReqOpen
     \brief This function must be called before any API call to MEAS (OEM DATA REQ/RSP module)
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 
 eHalStatus oemData_OemDataReqOpen(tHalHandle hHal);
@@ -102,16 +102,16 @@ eHalStatus oemData_OemDataReqOpen(tHalHandle hHal);
 /* ---------------------------------------------------------------------------
     \fn oemData_OemDataReqClose
     \brief This function must be called before closing the csr module
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 
 eHalStatus oemData_OemDataReqClose(tHalHandle hHal);
 
 /* HDD Callback function for the sme to callback when the oem data rsp is available */
 typedef eHalStatus (*oemData_OemDataReqCompleteCallback)(
-                                           tHalHandle, 
-                                           void* p2, 
-                                           tANI_U32 oemDataReqID, 
+                                           tHalHandle,
+                                           void* p2,
+                                           tANI_U32 oemDataReqID,
                                            eOemDataReqStatus status);
 
 /* ---------------------------------------------------------------------------
@@ -121,24 +121,24 @@ typedef eHalStatus (*oemData_OemDataReqCompleteCallback)(
     \param pOemDataReqID - pointer to an object to get back the request ID
     \param callback - a callback function that is called upon finish
     \param pContext - a pointer passed in for the callback
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
-eHalStatus oemData_OemDataReq(tHalHandle, tANI_U8, tOemDataReqConfig *, tANI_U32 *pOemDataReqID, 
+eHalStatus oemData_OemDataReq(tHalHandle, tANI_U8, tOemDataReqConfig *, tANI_U32 *pOemDataReqID,
                             oemData_OemDataReqCompleteCallback callback, void *pContext);
 
 /* ---------------------------------------------------------------------------
     \fn sme_HandleOemDataRsp
     \brief This function processes the oem data response obtained from the PE
     \param pMsg - Pointer to the pSirSmeOemDataRsp
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus sme_HandleOemDataRsp(tHalHandle hHal, tANI_U8*);
 
 /* ---------------------------------------------------------------------------
     \fn oemData_IsOemDataReqAllowed
-    \brief This function checks if oem data req/rsp can be performed in the 
+    \brief This function checks if oem data req/rsp can be performed in the
            current driver state
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus oemData_IsOemDataReqAllowed(tHalHandle hHal);
 
diff --git a/CORE/SME/inc/oemDataInternal.h b/CORE/SME/inc/oemDataInternal.h
index 67b086273bbc..e914562fb1b1 100644
--- a/CORE/SME/inc/oemDataInternal.h
+++ b/CORE/SME/inc/oemDataInternal.h
@@ -27,12 +27,12 @@
 
 #ifdef FEATURE_OEM_DATA_SUPPORT
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
+
 
-  
     \file oemDataInternal.h
-  
+
     Exports and types for the Common OEM DATA REQ/RSP Module interfaces.
 ========================================================================== */
 
@@ -50,7 +50,7 @@
 typedef struct tagOemDataStruct
 {
     tANI_U32                         nextOemReqId; //a global req id
-    tANI_BOOLEAN                     oemDataReqActive; //indicates that currently a request has been posted and 
+    tANI_BOOLEAN                     oemDataReqActive; //indicates that currently a request has been posted and
                                                         //waiting for the response
     oemData_OemDataReqCompleteCallback   callback; //callback function pointer for returning the response
     void*                            pContext; //context of the original caller
diff --git a/CORE/SME/inc/p2p_Api.h b/CORE/SME/inc/p2p_Api.h
index ef1b637e0774..e94293512415 100644
--- a/CORE/SME/inc/p2p_Api.h
+++ b/CORE/SME/inc/p2p_Api.h
@@ -46,15 +46,15 @@
 typedef struct sP2pPsConfig{
   tANI_U8   opp_ps;
   tANI_U32  ctWindow;
-  tANI_U8   count; 
+  tANI_U8   count;
   tANI_U32  duration;
   tANI_U32  interval;
   tANI_U32  single_noa_duration;
   tANI_U8   psSelection;
-  tANI_U8   sessionid;   
+  tANI_U8   sessionid;
 }tP2pPsConfig,*tpP2pPsConfig;
 
-typedef eHalStatus (*remainOnChanCallback)( tHalHandle, void* context, 
+typedef eHalStatus (*remainOnChanCallback)( tHalHandle, void* context,
                                             eHalStatus status );
 
 typedef struct sRemainOnChn{
@@ -94,12 +94,12 @@ typedef enum ep2pDiscoverType {
    WFD_DISCOVER_TYPE_SCAN_ONLY = 1,
    /** Driver must perform device discovery only using the find phase*/
    WFD_DISCOVER_TYPE_FIND_ONLY = 2,
-   /** Driver can use either use scan phase or find phase to discovery 
+   /** Driver can use either use scan phase or find phase to discovery
    P2P devices. In our case Driver uses scan phase */
    WFD_DISCOVER_TYPE_AUTO = 3,
    /*Scan only social channel*/
    WFD_DISCOVER_SCAN_ONLY_SOCIAL_CHN,
-   /** If it is set, driver must perform a complete discovery, 
+   /** If it is set, driver must perform a complete discovery,
    If it is false, it can do partial discovery.*/
    WFD_DISCOVER_TYPE_FORCED = 0x80000000
 } ep2pDiscoverType, *ePp2pDiscoverType;
@@ -123,7 +123,7 @@ typedef enum ep2pScanType {
 typedef enum ep2pListenStateDiscoverability {
    P2P_DEVICE_NOT_DISCOVERABLE, /**  Wi-Fi Direct Device Port must not make itself discoverable */
    P2P_DEVICE_AUTO_AVAILABILITY, /** Wi-Fi Direct Device Port must periodically put itself in the listen state to become discoverable*/
-   P2P_DEVICE_HIGH_AVAILABILITY  /** Wi-Fi Direct Device Port must be frequently put itself in the listen state 
+   P2P_DEVICE_HIGH_AVAILABILITY  /** Wi-Fi Direct Device Port must be frequently put itself in the listen state
                                  to increase the speed and reliability of remote devices discovering it */
 } ep2pListenStateDiscoverability, * ePp2pListenStateDiscoverability;
 
@@ -134,10 +134,10 @@ typedef enum ep2pOperatingMode {
    OPERATION_MODE_P2P_CLIENT
 }ep2pOperatingMode;
 
-typedef struct _tp2pDiscoverDeviceFilter{ 
-   tSirMacAddr DeviceID; 
-   v_UCHAR_t ucBitmask; 
-   tSirMacSSid GroupSSID; 
+typedef struct _tp2pDiscoverDeviceFilter{
+   tSirMacAddr DeviceID;
+   v_UCHAR_t ucBitmask;
+   tSirMacSSid GroupSSID;
 } tp2pDiscoverDeviceFilter;
 
 typedef struct _tp2pDiscoverRequest {
@@ -305,7 +305,7 @@ typedef struct p2p_invitation_request {
     tANI_U8 PeerDeviceAddress[P2P_MAC_ADDRESS_LEN];
     tANI_U32 uSendTimeout;
     tANI_U32 GoTimeout;
-    tANI_U32 ClientTimeout; 
+    tANI_U32 ClientTimeout;
     tANI_U8 InvitationFlags;
     tP2PGroupBssid GroupBSSID;
     tP2P_OperatingChannel OperatingChannel;
@@ -323,7 +323,7 @@ typedef struct p2p_invitation_response {
     tANI_U32 uSendTimeout;
     tANI_U8     status;
     tANI_U32 GoTimeout;
-    tANI_U32 ClientTimeout; 
+    tANI_U32 ClientTimeout;
     tP2PGroupBssid GroupBSSID;
     tP2P_OperatingChannel OperatingChannel;
     tANI_U32 uIELength;
@@ -434,7 +434,7 @@ typedef struct sp2pContext
    tp2pDiscoverDeviceFilter *directedDiscoveryFilter;
    tANI_U32 uNumDeviceFilters;
    //Number of deviceFilter directedDiscoveryFilter holds
-   tANI_U32 uNumDeviceFilterAllocated; 
+   tANI_U32 uNumDeviceFilterAllocated;
    tGroupFormationReq formationReq;
    tANI_U8 GroupFormationPending;
    tANI_BOOLEAN PeerFound;
@@ -480,7 +480,7 @@ eHalStatus sme_RemainOnChannel( tHalHandle hHal, tANI_U8 sessionId,
                                 void *pContext,
                                 tANI_U8 isP2PProbeReqAllowed);
 eHalStatus sme_ReportProbeReq( tHalHandle hHal, tANI_U8 flag );
-eHalStatus sme_updateP2pIe( tHalHandle hHal, void *p2pIe, 
+eHalStatus sme_updateP2pIe( tHalHandle hHal, void *p2pIe,
                             tANI_U32 p2pIeLength );
 eHalStatus sme_sendAction( tHalHandle hHal, tANI_U8 sessionId,
                            const tANI_U8 *pBuf, tANI_U32 len,
@@ -511,11 +511,11 @@ eHalStatus p2pSetPs( tHalHandle hHal, tP2pPsConfig *pNoA );
 tSirRFBand GetRFBand(tANI_U8 channel);
 #ifdef WLAN_FEATURE_P2P_INTERNAL
 eHalStatus p2pRemainOnChannelCallback(tHalHandle halHandle, void *pContext, eHalStatus scan_status);
-eHalStatus P2P_DiscoverRequest(tHalHandle hHal, tANI_U8 SessionID, tP2PDiscoverRequest *pDiscoverRequest, 
+eHalStatus P2P_DiscoverRequest(tHalHandle hHal, tANI_U8 SessionID, tP2PDiscoverRequest *pDiscoverRequest,
                                p2pDiscoverCompleteCallback callback, void *pContext);
 tANI_U8 p2pGetDialogToken(tHalHandle hHal, tANI_U8 SessionID, eP2PFrameType actionFrameType);
 eHalStatus P2P_ListenStateDiscoverable(tHalHandle hHal, tANI_U8 sessionId, ep2pListenStateDiscoverability listenState);
-eHalStatus p2pCreateSendActionFrame(tHalHandle hHal, tANI_U8 SessionID, 
+eHalStatus p2pCreateSendActionFrame(tHalHandle hHal, tANI_U8 SessionID,
       void *p2pactionframe, eP2PFrameType actionFrameType, tANI_U32 timeout);
 eHalStatus p2pScanRequest(tp2pContext *p2pContext, p2pDiscoverCompleteCallback callback, void *pContext);
 void p2pActionFrameTimerHandler(void *pContext);
diff --git a/CORE/SME/inc/pmc.h b/CORE/SME/inc/pmc.h
index 821a16da0965..59ea1a3a4921 100644
--- a/CORE/SME/inc/pmc.h
+++ b/CORE/SME/inc/pmc.h
@@ -45,9 +45,9 @@
 #include "smeInternal.h"
 
 
-//Change PMC_ABORT to no-op for now. We need to define it as VOS_ASSERT(0) once we 
+//Change PMC_ABORT to no-op for now. We need to define it as VOS_ASSERT(0) once we
 //cleanup the usage.
-#define PMC_ABORT  
+#define PMC_ABORT
 
 #define PMC_SESSION_MAX 5
 
@@ -101,7 +101,7 @@ typedef struct sRequestBmpsEntry
    void (*callbackRoutine) (void *callbackContext, eHalStatus status);
 
    /* value to be passed as parameter to routine specified above */
-   void *callbackContext;  
+   void *callbackContext;
 
 } tRequestBmpsEntry, *tpRequestBmpsEntry;
 
@@ -115,7 +115,7 @@ typedef struct sStartUapsdEntry
    void (*callbackRoutine) (void *callbackContext, eHalStatus status);
 
    /* value to be passed as parameter to routine specified above */
-   void *callbackContext;  
+   void *callbackContext;
 
 } tStartUapsdEntry, *tpStartUapsdEntry;
 
@@ -159,11 +159,11 @@ typedef struct sPmcInfo
     tANI_U32 remainInPowerActiveThreshold;  /*Remain in Power active till DHCP threshold*/
     tANI_U32 impsPeriod;  /* amount of time to remain in IMPS */
     void (*impsCallbackRoutine) (void *callbackContext, eHalStatus status);  /* routine to call when IMPS period
-                                                                                has finished */ 
+                                                                                has finished */
     void *impsCallbackContext;  /* value to be passed as parameter to routine specified above */
     vos_timer_t hImpsTimer;  /* timer to use with IMPS */
     vos_timer_t hTrafficTimer;  /* timer to measure traffic for BMPS */
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
     vos_timer_t hDiagEvtTimer;  /* timer to report PMC state through DIAG event */
 #endif
     vos_timer_t hExitPowerSaveTimer;  /* timer for deferred exiting of power save mode */
@@ -178,32 +178,32 @@ typedef struct sPmcInfo
     tDblLinkList requestBmpsList; /* request Bmps callback routine list */
     tDblLinkList requestStartUapsdList; /* request start Uapsd callback routine list */
     tANI_BOOLEAN standbyEnabled;  /* TRUE if Standby is enabled */
-    void (*standbyCallbackRoutine) (void *callbackContext, eHalStatus status); /* routine to call for standby request */ 
+    void (*standbyCallbackRoutine) (void *callbackContext, eHalStatus status); /* routine to call for standby request */
     void *standbyCallbackContext;/* value to be passed as parameter to routine specified above */
     tDblLinkList deviceStateUpdateIndList; /*update device state indication list */
     tANI_BOOLEAN pmcReady; /*whether eWNI_SME_SYS_READY_IND has been sent to PE or not */
     tANI_BOOLEAN wowlEnabled;  /* TRUE if WoWL is enabled */
     tANI_BOOLEAN wowlModeRequired; /* TRUE if device should go to WOWL on entering BMPS */
-    void (*enterWowlCallbackRoutine) (void *callbackContext, eHalStatus status); /* routine to call for wowl request */ 
+    void (*enterWowlCallbackRoutine) (void *callbackContext, eHalStatus status); /* routine to call for wowl request */
     void *enterWowlCallbackContext;/* value to be passed as parameter to routine specified above */
     tSirSmeWowlEnterParams wowlEnterParams; /* WOWL mode configuration */
     tDblLinkList deferredMsgList;   //The message in here are deferred and DONOT expect response from PE
     tANI_BOOLEAN rfSuppliesVotedOff;  //Whether RF supplies are voted off or not.
 #ifdef FEATURE_WLAN_SCAN_PNO
-    preferredNetworkFoundIndCallback  prefNetwFoundCB; /* routine to call for Preferred Network Found Indication */ 
+    preferredNetworkFoundIndCallback  prefNetwFoundCB; /* routine to call for Preferred Network Found Indication */
     void *preferredNetworkFoundIndCallbackContext;/* value to be passed as parameter to routine specified above */
 #endif // FEATURE_WLAN_SCAN_PNO
 #ifdef WLAN_FEATURE_PACKET_FILTERING
-    FilterMatchCountCallback  FilterMatchCountCB; /* routine to call for Packet Coalescing Filter Match Count */ 
+    FilterMatchCountCallback  FilterMatchCountCB; /* routine to call for Packet Coalescing Filter Match Count */
     void *FilterMatchCountCBContext;/* value to be passed as parameter to routine specified above */
 #endif // WLAN_FEATURE_PACKET_FILTERING
 #ifdef WLAN_FEATURE_GTK_OFFLOAD
-    GTKOffloadGetInfoCallback  GtkOffloadGetInfoCB; /* routine to call for GTK Offload Information */ 
+    GTKOffloadGetInfoCallback  GtkOffloadGetInfoCB; /* routine to call for GTK Offload Information */
     void *GtkOffloadGetInfoCBContext;        /* value to be passed as parameter to routine specified above */
 #endif // WLAN_FEATURE_GTK_OFFLOAD
 
 #ifdef WLAN_WAKEUP_EVENTS
-    void (*wakeReasonIndCB) (void *callbackContext, tpSirWakeReasonInd pWakeReasonInd);  /* routine to call for Wake Reason Indication */ 
+    void (*wakeReasonIndCB) (void *callbackContext, tpSirWakeReasonInd pWakeReasonInd);  /* routine to call for Wake Reason Indication */
     void *wakeReasonIndCBContext;  /* value to be passed as parameter to routine specified above */
 #endif // WLAN_WAKEUP_EVENTS
 
@@ -258,7 +258,7 @@ extern void pmcStopTrafficTimer (tHalHandle hHal);
 extern void pmcImpsTimerExpired (tHalHandle hHal);
 extern void pmcTrafficTimerExpired (tHalHandle hHal);
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
 extern eHalStatus pmcStartDiagEvtTimer (tHalHandle hHal);
 extern void pmcStopDiagEvtTimer (tHalHandle hHal);
 extern void pmcDiagEvtTimerExpired (tHalHandle hHal);
@@ -274,7 +274,7 @@ extern eHalStatus pmcRequestExitWowlState(tHalHandle hHal,
                                           tpSirSmeWowlExitParams wowlExitParams);
 extern void pmcDoEnterWowlCallbacks (tHalHandle hHal, eHalStatus callbackStatus);
 //The function will request for full power as well in addition to defer the message
-extern eHalStatus pmcDeferMsg( tpAniSirGlobal pMac, tANI_U16 messageType, 
+extern eHalStatus pmcDeferMsg( tpAniSirGlobal pMac, tANI_U16 messageType,
                                                void *pData, tANI_U32 size);
 extern eHalStatus pmcIssueCommand(tpAniSirGlobal pMac, tANI_U32 sessionId,
                                  eSmeCommandType cmdType, void *pvParam,
diff --git a/CORE/SME/inc/pmcApi.h b/CORE/SME/inc/pmcApi.h
index 17e4ca76c899..d7ad1cd29083 100644
--- a/CORE/SME/inc/pmcApi.h
+++ b/CORE/SME/inc/pmcApi.h
@@ -49,7 +49,7 @@
 #define __PMC_API_H__
 
 //This timer value determines the default periodicity at which BMPS retries will happen
-//This default value is overwritten typicaly by OS specific registry/INI values. 
+//This default value is overwritten typicaly by OS specific registry/INI values.
 #define BMPS_TRAFFIC_TIMER_DEFAULT 5000  //unit = ms
 #define DHCP_REMAIN_POWER_ACTIVE_THRESHOLD 12 // (12 * 5) sec = 60 seconds = 1 min
 
@@ -139,7 +139,7 @@ typedef enum ePmcPowerState
 
 } tPmcPowerState;
 
- 
+
 
 /* PMC states. */
 
@@ -267,13 +267,13 @@ typedef struct sPmcBmpsConfigParams
 
                                          frame has been processed */
 
-    tANI_BOOLEAN enableBeaconEarlyTermination; /* if TRUE, BET feature in RIVA 
+    tANI_BOOLEAN enableBeaconEarlyTermination; /* if TRUE, BET feature in RIVA
                                       will be enabled, FALSE otherwise, TRUE means:
-                                      RXP will read the beacon header for the 
-                                      TIM bit & discard the rest if set to 0, 
+                                      RXP will read the beacon header for the
+                                      TIM bit & discard the rest if set to 0,
                                       while in BMPS              */
-    tANI_U8      bcnEarlyTermWakeInterval; /* This specifies how often in terms 
-                                      of LI we will disable BET in order to sync 
+    tANI_U8      bcnEarlyTermWakeInterval; /* This specifies how often in terms
+                                      of LI we will disable BET in order to sync
                                       up TSF*/
 
 } tPmcBmpsConfigParams, *tpPmcBmpsConfigParams;
@@ -376,14 +376,14 @@ extern eHalStatus pmcRequestStandby (
    void *callbackContext);
 
 
-extern eHalStatus pmcRegisterDeviceStateUpdateInd (tHalHandle hHal, 
+extern eHalStatus pmcRegisterDeviceStateUpdateInd (tHalHandle hHal,
 
    void (*callbackRoutine) (void *callbackContext, tPmcState pmcState),
 
    void *callbackContext);
 
 
-extern eHalStatus pmcDeregisterDeviceStateUpdateInd (tHalHandle hHal, 
+extern eHalStatus pmcDeregisterDeviceStateUpdateInd (tHalHandle hHal,
 
    void (*callbackRoutine) (void *callbackContext, tPmcState pmcState));
 
@@ -395,20 +395,20 @@ void pmcDumpInit(tHalHandle hHal);
 
 
 extern eHalStatus pmcWowlAddBcastPattern (
-   tHalHandle hHal, 
-   tpSirWowlAddBcastPtrn pattern, 
+   tHalHandle hHal,
+   tpSirWowlAddBcastPtrn pattern,
    tANI_U8  sessionId);
 
 
 extern eHalStatus pmcWowlDelBcastPattern (
-   tHalHandle hHal, 
+   tHalHandle hHal,
    tpSirWowlDelBcastPtrn pattern,
    tANI_U8 sessionId);
 
 
-extern eHalStatus pmcEnterWowl ( 
+extern eHalStatus pmcEnterWowl (
 
-    tHalHandle hHal, 
+    tHalHandle hHal,
 
     void (*enterWowlCallbackRoutine) (void *callbackContext, eHalStatus status),
 
@@ -433,7 +433,7 @@ extern eHalStatus pmcSetHostOffload (tHalHandle hHal, tpSirHostOffloadReq pReque
     \param  pRequest - Pointer to the Keep Alive.
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot set the keepalive.
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
 extern eHalStatus pmcSetKeepAlive (tHalHandle hHal, tpSirKeepAliveReq pRequest, tANI_U8 sessionId);
 
@@ -454,7 +454,7 @@ extern eHalStatus pmcSetRssiFilter(tHalHandle hHal, v_U8_t rssiThreshold);
 // Packet Coalescing Filter Match Count Callback declaration
 typedef void(*FilterMatchCountCallback)(void *callbackContext,
                                         tpSirRcvFltPktMatchRsp pRcvFltPktMatchRsp);
-extern eHalStatus pmcGetFilterMatchCount(tHalHandle hHal, FilterMatchCountCallback callbackRoutine, 
+extern eHalStatus pmcGetFilterMatchCount(tHalHandle hHal, FilterMatchCountCallback callbackRoutine,
                                                 void *callbackContext, tANI_U8 sessionId);
 #endif // WLAN_FEATURE_PACKET_FILTERING
 
@@ -469,7 +469,7 @@ typedef void(*GTKOffloadGetInfoCallback)(void *callbackContext, tpSirGtkOffloadG
     \param  pGtkOffload - Pointer to the GTK offload request.
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot set the offload.
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
 extern eHalStatus pmcSetGTKOffload (tHalHandle hHal, tpSirGtkOffloadParams pGtkOffload, tANI_U8 sessionId);
 
@@ -480,7 +480,7 @@ extern eHalStatus pmcSetGTKOffload (tHalHandle hHal, tpSirGtkOffloadParams pGtkO
     \param  callbackRoutine - Pointer to the GTK Offload Get Info response callback routine.
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot set the offload.
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
 extern eHalStatus pmcGetGTKOffload(tHalHandle hHal,
                                    GTKOffloadGetInfoCallback callbackRoutine,
@@ -642,4 +642,3 @@ eHalStatus PmcOffloadEnableDeferredStaModePowerSave(tHalHandle hHal,
 eHalStatus PmcOffloadDisableDeferredStaModePowerSave(tHalHandle hHal,
                                              tANI_U32 sessionId);
 #endif
-
diff --git a/CORE/SME/inc/smeInside.h b/CORE/SME/inc/smeInside.h
index 8b70eaf95d29..7f29e9ffc6c4 100644
--- a/CORE/SME/inc/smeInside.h
+++ b/CORE/SME/inc/smeInside.h
@@ -30,11 +30,11 @@
 
 
 /**=========================================================================
-  
+
   \file  smeInside.h
-  
+
   \brief prototype for SME structures and APIs used insside SME
-  
+
   ========================================================================*/
 
 /* $Header$ */
@@ -62,7 +62,7 @@
 #endif
 ePhyChanBondState csrConvertCBIniValueToPhyCBState(v_U32_t cbIniValue);
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Type declarations
   ------------------------------------------------------------------------*/
 
@@ -215,7 +215,7 @@ typedef struct tagSmeCmd
 
 
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
                          Internal to SME
   ------------------------------------------------------------------------*/
 
@@ -243,7 +243,7 @@ tANI_BOOLEAN qosProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand );
 eHalStatus csrProcessScanCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand );
 eHalStatus csrRoamProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand );
 void csrRoamProcessWmStatusChangeCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand );
-void csrReinitRoamCmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); 
+void csrReinitRoamCmd(tpAniSirGlobal pMac, tSmeCmd *pCommand);
 void csrReinitWmStatusChangeCmd(tpAniSirGlobal pMac, tSmeCmd *pCommand);
 void csrReinitSetKeyCmd(tpAniSirGlobal pMac, tSmeCmd *pCommand);
 void csrReinitRemoveKeyCmd(tpAniSirGlobal pMac, tSmeCmd *pCommand);
@@ -279,7 +279,7 @@ eHalStatus csrProcessDelStaSessionRsp( tpAniSirGlobal pMac, tANI_U8 *pMsg);
     \param  sessionId .  Session index of the session
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot set the offload.
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
 eHalStatus pmcSetNSOffload (tHalHandle hHal, tpSirHostOffloadReq pRequest, tANI_U8 sessionId);
 #endif //WLAN_NS_OFFLOAD
diff --git a/CORE/SME/inc/smeInternal.h b/CORE/SME/inc/smeInternal.h
index e1ab3f9ea7e5..6cd51d7fed0b 100644
--- a/CORE/SME/inc/smeInternal.h
+++ b/CORE/SME/inc/smeInternal.h
@@ -32,11 +32,11 @@
 
 
 /**=========================================================================
-  
+
   \file  smeInternal.h
-  
+
   \brief prototype for SME internal structures and APIs used for SME and MAC
-  
+
   ========================================================================*/
 
 /* $Header$ */
@@ -52,30 +52,30 @@
 #include "vos_diag_core_event.h"
 #include "csrLinkList.h"
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Type declarations
   ------------------------------------------------------------------------*/
 
 // Mask can be only have one bit set
-typedef enum eSmeCommandType 
+typedef enum eSmeCommandType
 {
-    eSmeNoCommand = 0, 
+    eSmeNoCommand = 0,
     eSmeDropCommand,
     //CSR
     eSmeCsrCommandMask = 0x10000,   //this is not a command, it is to identify this is a CSR command
     eSmeCommandScan,
-    eSmeCommandRoam, 
-    eSmeCommandWmStatusChange, 
+    eSmeCommandRoam,
+    eSmeCommandWmStatusChange,
     eSmeCommandSetKey,
     eSmeCommandRemoveKey,
     eSmeCommandAddStaSession,
     eSmeCommandDelStaSession,
 #ifdef FEATURE_WLAN_TDLS
     //eSmeTdlsCommandMask = 0x80000,  //To identify TDLS commands <TODO>
-    //These can be considered as csr commands. 
-    eSmeCommandTdlsSendMgmt, 
-    eSmeCommandTdlsAddPeer, 
-    eSmeCommandTdlsDelPeer, 
+    //These can be considered as csr commands.
+    eSmeCommandTdlsSendMgmt,
+    eSmeCommandTdlsAddPeer,
+    eSmeCommandTdlsDelPeer,
     eSmeCommandTdlsLinkEstablish,
 #ifdef FEATURE_WLAN_TDLS_INTERNAL
     eSmeCommandTdlsDiscovery,
@@ -127,7 +127,7 @@ typedef struct tagSmeStruct
     tDblLinkList smeCmdActiveList;
     tDblLinkList smeCmdPendingList;
     tDblLinkList smeCmdFreeList;   //preallocated roam cmd list
-    void (*pTxPerHitCallback) (void *pCallbackContext); /* callback for Tx PER hit to HDD */ 
+    void (*pTxPerHitCallback) (void *pCallbackContext); /* callback for Tx PER hit to HDD */
     void *pTxPerHitCbContext;
     tVOS_CON_MODE currDeviceMode;
 #ifdef FEATURE_WLAN_LPHB
diff --git a/CORE/SME/inc/smeQosInternal.h b/CORE/SME/inc/smeQosInternal.h
index adca10928a21..9ebf0a1e3d3d 100644
--- a/CORE/SME/inc/smeQosInternal.h
+++ b/CORE/SME/inc/smeQosInternal.h
@@ -31,11 +31,11 @@
 
 
 /**=========================================================================
-  
+
   \file  smeQosInternal.h
-  
+
   \brief prototype for SME QoS APIs
-  
+
   ========================================================================*/
 
 /* $Header$ */
@@ -52,7 +52,7 @@
 #include "sme_QosApi.h"
 #include "smeInternal.h"
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Type declarations
   ------------------------------------------------------------------------*/
 #define SME_QOS_AP_SUPPORTS_APSD         0x80
@@ -67,13 +67,13 @@ typedef enum
    SME_QOS_EDCA_AC_BK = 1,  /* Background access category              */
    SME_QOS_EDCA_AC_VI = 2,  /* Video access category                   */
    SME_QOS_EDCA_AC_VO = 3,  /* Voice access category                   */
-  
+
    SME_QOS_EDCA_AC_MAX
 } sme_QosEdcaAcType;
 
 
 /*---------------------------------------------------------------------------
-   Enumeration of the various CSR event indication types that would be reported 
+   Enumeration of the various CSR event indication types that would be reported
    by CSR
 ---------------------------------------------------------------------------*/
 typedef enum
@@ -116,109 +116,109 @@ typedef enum
 
 #endif //FEATURE_WLAN_DIAG_SUPPORT
 /*---------------------------------------------------------------------------
-    The association information structure to be passed by CSR after assoc or 
+    The association information structure to be passed by CSR after assoc or
     reassoc is done
 ---------------------------------------------------------------------------*/
 typedef struct
-{ 
+{
    tSirBssDescription            *pBssDesc;
    tCsrRoamProfile               *pProfile;
 } sme_QosAssocInfo;
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
                          External APIs for CSR - Internal to SME
   ------------------------------------------------------------------------*/
 
 /* --------------------------------------------------------------------------
-    \brief sme_QosOpen() - This function must be called before any API call to 
+    \brief sme_QosOpen() - This function must be called before any API call to
     SME QoS module.
 
     \param pMac - Pointer to the global MAC parameter structure.
-    
-    \return eHalStatus     
+
+    \return eHalStatus
 ----------------------------------------------------------------------------*/
 eHalStatus sme_QosOpen(tpAniSirGlobal pMac);
 
 /* --------------------------------------------------------------------------
-    \brief sme_QosClose() - To close down SME QoS module. There should not be 
+    \brief sme_QosClose() - To close down SME QoS module. There should not be
     any API call into this module after calling this function until another
     call of sme_QosOpen.
 
     \param pMac - Pointer to the global MAC parameter structure.
-    
-    \return eHalStatus     
+
+    \return eHalStatus
 ----------------------------------------------------------------------------*/
 eHalStatus sme_QosClose(tpAniSirGlobal pMac);
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosSetParams() - This function is used by HDD to provide the 
+  \brief sme_QosSetParams() - This function is used by HDD to provide the
    default TSPEC params to SME.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
   \param pQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM TSPEC
                     related info per AC as defined above, provided by HDD
-  
+
   \return eHAL_STATUS_SUCCESS - Setparam is successful.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosSetParams(tpAniSirGlobal pMac, sme_QosWmmTspecInfo * pQoSInfo);
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosMsgProcessor() - sme_ProcessMsg() calls this function for the 
+  \brief sme_QosMsgProcessor() - sme_ProcessMsg() calls this function for the
   messages that are handled by SME QoS module.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
   \param msg_type - the type of msg passed by PE as defined in wniApi.h
-  \param pMsgBuf - a pointer to a buffer that maps to various structures base 
+  \param pMsgBuf - a pointer to a buffer that maps to various structures base
                    on the message type.
                    The beginning of the buffer can always map to tSirSmeRsp.
-  
+
   \return eHalStatus.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
-eHalStatus sme_QosMsgProcessor( tpAniSirGlobal pMac,  v_U16_t msg_type, 
+eHalStatus sme_QosMsgProcessor( tpAniSirGlobal pMac,  v_U16_t msg_type,
                                 void *pMsgBuf);
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
                          Internal APIs for CSR
   ------------------------------------------------------------------------*/
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosValidateParams() - The SME QoS API exposed to CSR to validate AP 
+  \brief sme_QosValidateParams() - The SME QoS API exposed to CSR to validate AP
   capabilities regarding QoS support & any other QoS parameter validation.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
-  \param pBssDesc - Pointer to the BSS Descriptor information passed down by 
+  \param pBssDesc - Pointer to the BSS Descriptor information passed down by
                     CSR to PE while issuing the Join request
-  
+
   \return eHAL_STATUS_SUCCESS - Validation is successful
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
-eHalStatus sme_QosValidateParams(tpAniSirGlobal pMac, 
+eHalStatus sme_QosValidateParams(tpAniSirGlobal pMac,
                                  tSirBssDescription *pBssDesc);
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosCsrEventInd() - The QoS sub-module in SME expects notifications 
+  \brief sme_QosCsrEventInd() - The QoS sub-module in SME expects notifications
   from CSR when certain events occur as mentioned in sme_QosCsrEventIndType.
 
   \param pMac - Pointer to the global MAC parameter structure.
   \param ind - The event occurred of type sme_QosCsrEventIndType.
   \param pEvent_info - Information related to the event
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosCsrEventInd(tpAniSirGlobal pMac,
                               v_U8_t sessionId,
-                              sme_QosCsrEventIndType ind, 
+                              sme_QosCsrEventIndType ind,
                               void *pEvent_info);
 
 /*--------------------------------------------------------------------------
@@ -229,11 +229,11 @@ eHalStatus sme_QosCsrEventInd(tpAniSirGlobal pMac,
   \param pSirBssDesc - The event occurred of type sme_QosCsrEventIndType.
   \param pIes - the parsed IE for pSirBssDesc. This can be NULL.
 
-  
+
   \return a bit mask indicating for which ACs AP has ACM set to 1
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 v_U8_t sme_QosGetACMMask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes);
 
diff --git a/CORE/SME/inc/smeRrmInternal.h b/CORE/SME/inc/smeRrmInternal.h
index 2defec2758ce..8ca8c71e8d00 100644
--- a/CORE/SME/inc/smeRrmInternal.h
+++ b/CORE/SME/inc/smeRrmInternal.h
@@ -30,11 +30,11 @@
 
 
 /**=========================================================================
-  
+
   \file  smeRrmInternal.h
-  
+
   \brief prototype for SME RRM APIs
-  
+
   ========================================================================*/
 
 /* $Header$ */
@@ -49,7 +49,7 @@
 #include "palTimer.h"
 #include "rrmGlobal.h"
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Type declarations
   ------------------------------------------------------------------------*/
 typedef struct sRrmConfigParam
@@ -103,7 +103,7 @@ typedef struct sRrmSMEContext
    tCsrCcxBeaconReq  ccxBcnReqInfo;
 #endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
    tRrmMsgReqSource msgSource;
-}tRrmSMEContext, *tpRrmSMEContext; 
+}tRrmSMEContext, *tpRrmSMEContext;
 
 typedef struct sRrmNeighborReq
 {
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index c9d74ee8f26b..44468a626cdf 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -32,11 +32,11 @@
 
 
 /**=========================================================================
-  
+
   \file  smeApi.h
-  
+
   \brief prototype for SME APIs
-  
+
   ========================================================================*/
 
 /* $Header$ */
@@ -63,7 +63,7 @@
 #include "smeRrmInternal.h"
 #endif
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Preprocessor definitions and constants
   ------------------------------------------------------------------------*/
 
@@ -101,7 +101,7 @@
 } while(0)
 #endif
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Type declarations
   ------------------------------------------------------------------------*/
 typedef struct _smeConfigParams
@@ -197,27 +197,27 @@ typedef struct {
     u_int8_t smeThermalMgmtEnabled;
     u_int32_t smeThrottlePeriod;
 } tSmeThermalParams;
-/*------------------------------------------------------------------------- 
+/*-------------------------------------------------------------------------
   Function declarations and documenation
   ------------------------------------------------------------------------*/
 
 /*--------------------------------------------------------------------------
-  
+
   \brief sme_Open() - Initialze all SME modules and put them at idle state
-  
-  The function initializes each module inside SME, PMC, CCM, CSR, etc. . Upon 
+
+  The function initializes each module inside SME, PMC, CCM, CSR, etc. . Upon
   successfully return, all modules are at idle state ready to start.
 
-  smeOpen must be called before any other SME APIs can be involved. 
+  smeOpen must be called before any other SME APIs can be involved.
   smeOpen must be called after macOpen.
-  
+
   \param hHal - The handle returned by macOpen.
-  
+
   \return eHAL_STATUS_SUCCESS - SME is successfully initialized.
-  
-          Other status means SME is failed to be initialized     
+
+          Other status means SME is failed to be initialized
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_Open(tHalHandle hHal);
 
@@ -241,84 +241,84 @@ eHalStatus sme_Open(tHalHandle hHal);
 eHalStatus sme_init_chan_list(tHalHandle hal);
 
 /*--------------------------------------------------------------------------
-  
+
   \brief sme_Close() - Release all SME modules and their resources.
-  
-  The function release each module in SME, PMC, CCM, CSR, etc. . Upon 
+
+  The function release each module in SME, PMC, CCM, CSR, etc. . Upon
   return, all modules are at closed state.
 
-  No SME APIs can be involved after sme_Close except sme_Open. 
+  No SME APIs can be involved after sme_Close except sme_Open.
   sme_Close must be called before macClose.
-  
+
   \param hHal - The handle returned by macOpen.
-  
+
   \return eHAL_STATUS_SUCCESS - SME is successfully close.
-  
+
           Other status means SME is failed to be closed but caller still cannot
           call any other SME functions except smeOpen.
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_Close(tHalHandle hHal);
 
 /*--------------------------------------------------------------------------
-  
+
   \brief sme_Start() - Put all SME modules at ready state.
-  
-  The function starts each module in SME, PMC, CCM, CSR, etc. . Upon 
+
+  The function starts each module in SME, PMC, CCM, CSR, etc. . Upon
   successfully return, all modules are ready to run.
 
   \param hHal - The handle returned by macOpen.
-  
+
   \return eHAL_STATUS_SUCCESS - SME is ready.
-  
-          Other status means SME is failed to start.     
+
+          Other status means SME is failed to start.
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_Start(tHalHandle hHal);
 
 /*--------------------------------------------------------------------------
-  
+
   \brief sme_Stop() - Stop all SME modules and put them at idle state
-  
-  The function stops each module in SME, PMC, CCM, CSR, etc. . Upon 
+
+  The function stops each module in SME, PMC, CCM, CSR, etc. . Upon
   return, all modules are at idle state ready to start.
 
-  
+
   \param hHal - The handle returned by macOpen.
 
   \param tHalStopType - reason for stopping
-  
+
   \return eHAL_STATUS_SUCCESS - SME is stopped.
-  
-          Other status means SME is failed to stop but caller should still consider 
+
+          Other status means SME is failed to stop but caller should still consider
           SME is stopped.
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_Stop(tHalHandle hHal, tHalStopType stopType);
 
 
 /*--------------------------------------------------------------------------
-  
-  \brief sme_OpenSession() - Open a session for scan/roam operation. 
-  
+
+  \brief sme_OpenSession() - Open a session for scan/roam operation.
+
   This is a synchronous API.
 
-  
+
   \param hHal - The handle returned by macOpen.
   \param callback - A pointer to the function caller specifies for roam/connect status indication
   \param pContext - The context passed with callback
   \param pSelfMacAddr - Caller allocated memory filled with self MAC address (6 bytes)
   \param pbSessionId - pointer to a caller allocated buffer for returned session ID
-  
+
   \return eHAL_STATUS_SUCCESS - session is opened. sessionId returned.
-  
-          Other status means SME is failed to open the session.  
+
+          Other status means SME is failed to open the session.
           eHAL_STATUS_RESOURCES - no more session available.
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_OpenSession(tHalHandle hHal, csrRoamCompleteCallback callback,
                            void *pContext, tANI_U8 *pSelfMacAddr,
@@ -335,22 +335,22 @@ eHalStatus sme_OpenSession(tHalHandle hHal, csrRoamCompleteCallback callback,
 void sme_SetCurrDeviceMode (tHalHandle hHal, tVOS_CON_MODE currDeviceMode);
 
 /*--------------------------------------------------------------------------
-  
-  \brief sme_CloseSession() - Open a session for scan/roam operation. 
-  
+
+  \brief sme_CloseSession() - Open a session for scan/roam operation.
+
   This is a synchronous API.
 
-  
+
   \param hHal - The handle returned by macOpen.
 
   \param sessionId - A previous opened session's ID.
-  
-  \return eHAL_STATUS_SUCCESS - session is closed. 
-  
-          Other status means SME is failed to open the session.  
-          eHAL_STATUS_INVALID_PARAMETER - session is not opened. 
+
+  \return eHAL_STATUS_SUCCESS - session is closed.
+
+          Other status means SME is failed to open the session.
+          eHAL_STATUS_INVALID_PARAMETER - session is not opened.
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_CloseSession(tHalHandle hHal, tANI_U8 sessionId,
                          csrRoamSessionCloseCallback callback, void *pContext);
@@ -358,24 +358,24 @@ eHalStatus sme_CloseSession(tHalHandle hHal, tANI_U8 sessionId,
 
 
 /*--------------------------------------------------------------------------
-  
+
   \brief sme_UpdateConfig() - Change configurations for all SME moduels
-  
+
   The function updates some configuration for modules in SME, CCM, CSR, etc
   during SMEs close -> open sequence.
-   
+
   Modules inside SME apply the new configuration at the next transaction.
 
-  
+
   \param hHal - The handle returned by macOpen.
-  \Param pSmeConfigParams - a pointer to a caller allocated object of 
+  \Param pSmeConfigParams - a pointer to a caller allocated object of
   typedef struct _smeConfigParams.
-  
+
   \return eHAL_STATUS_SUCCESS - SME update the config parameters successfully.
-  
+
           Other status means SME is failed to update the config parameters.
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_UpdateConfig(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams);
 
@@ -383,14 +383,14 @@ eHalStatus sme_UpdateConfig(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams)
 /*--------------------------------------------------------------------------
 
   \brief sme_UpdateChannelConfig() - Update channel configuration in RIVA.
- 
-  It is used at driver start up to inform RIVA of the default channel 
-  configuration. 
+
+  It is used at driver start up to inform RIVA of the default channel
+  configuration.
 
   This is a synchronuous call
 
   \param hHal - The handle returned by macOpen.
-  
+
   \return eHAL_STATUS_SUCCESS - SME update the channel config successfully.
 
           Other status means SME is failed to update the channel config.
@@ -422,9 +422,9 @@ eHalStatus sme_SetPlmRequest(tHalHandle hHal, tpSirPlmReq pPlm);
 #endif
 
 /*--------------------------------------------------------------------------
-  
+
   \brief sme_set11dinfo() - Set the 11d information about valid channels
-   and there power using information from nvRAM 
+   and there power using information from nvRAM
    This function is called only for AP.
 
   This is a synchronuous call
@@ -463,65 +463,65 @@ eHalStatus sme_setRegInfo(tHalHandle hHal,  tANI_U8 *apCntryCode);
 
 /* ---------------------------------------------------------------------------
     \fn sme_ChangeConfigParams
-    \brief The SME API exposed for HDD to provide config params to SME during 
-    SMEs stop -> start sequence. 
-    
-    If HDD changed the domain that will cause a reset. This function will 
+    \brief The SME API exposed for HDD to provide config params to SME during
+    SMEs stop -> start sequence.
+
+    If HDD changed the domain that will cause a reset. This function will
     provide the new set of 11d information for the new domain. Currrently this
     API provides info regarding 11d only at reset but we can extend this for
     other params (PMC, QoS) which needs to be initialized again at reset.
 
     This is a synchronuous call
-    
+
     \param hHal - The handle returned by macOpen.
 
     \Param
-    pUpdateConfigParam - a pointer to a structure (tCsrUpdateConfigParam) that 
-                currently provides 11d related information like Country code, 
-                Regulatory domain, valid channel list, Tx power per channel, a 
-                list with active/passive scan allowed per valid channel. 
+    pUpdateConfigParam - a pointer to a structure (tCsrUpdateConfigParam) that
+                currently provides 11d related information like Country code,
+                Regulatory domain, valid channel list, Tx power per channel, a
+                list with active/passive scan allowed per valid channel.
 
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_ChangeConfigParams(tHalHandle hHal, 
+eHalStatus sme_ChangeConfigParams(tHalHandle hHal,
                                  tCsrUpdateConfigParam *pUpdateConfigParam);
 
 /*--------------------------------------------------------------------------
-  
+
   \brief sme_HDDReadyInd() - SME sends eWNI_SME_SYS_READY_IND to PE to inform that the NIC
   is ready tio run.
-  
-  The function is called by HDD at the end of initialization stage so PE/HAL can enable the NIC 
-  to running state. 
-  
-  
+
+  The function is called by HDD at the end of initialization stage so PE/HAL can enable the NIC
+  to running state.
+
+
   \param hHal - The handle returned by macOpen.
-  
+
   \return eHAL_STATUS_SUCCESS - eWNI_SME_SYS_READY_IND is sent to PE successfully.
-  
+
           Other status means SME failed to send the message to PE.
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_HDDReadyInd(tHalHandle hHal);
 
 
 /*--------------------------------------------------------------------------
-  
+
   \brief sme_ProcessMsg() - The main message processor for SME.
-  
-  The function is called by a message dispatcher when to process a message 
-  targeted for SME. 
-  
-  
+
+  The function is called by a message dispatcher when to process a message
+  targeted for SME.
+
+
   \param hHal - The handle returned by macOpen.
   \param pMsg - A pointer to a caller allocated object of tSirMsgQ.
-  
+
   \return eHAL_STATUS_SUCCESS - SME successfully process the message.
-  
+
           Other status means SME failed to process the message.
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_ProcessMsg(tHalHandle hHal, vos_msg_t* pMsg);
 
@@ -531,13 +531,13 @@ v_VOID_t sme_FreeMsg( tHalHandle hHal, vos_msg_t* pMsg );
     \fn sme_ScanRequest
     \brief a wrapper function to Request a 11d or full scan from CSR.
     \param pScanRequestID - pointer to an object to get back the request ID
-    \param callback - a callback function that scan calls upon finish, will not 
+    \param callback - a callback function that scan calls upon finish, will not
                       be called if csrScanRequest returns error
     \param pContext - a pointer passed in for the callback
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_ScanRequest(tHalHandle hHal, tANI_U8 sessionId, tCsrScanRequest *, 
-                           tANI_U32 *pScanRequestID, 
+eHalStatus sme_ScanRequest(tHalHandle hHal, tANI_U8 sessionId, tCsrScanRequest *,
+                           tANI_U32 *pScanRequestID,
                            csrScanCompleteCallback callback, void *pContext);
 
 
@@ -545,7 +545,7 @@ eHalStatus sme_ScanRequest(tHalHandle hHal, tANI_U8 sessionId, tCsrScanRequest *
     \fn sme_ScanSetBGScanparams
     \brief a wrapper function to request CSR to set BG scan params in PE
     \param pScanReq - BG scan request structure
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_ScanSetBGScanparams(tHalHandle hHal, tANI_U8 sessionId, tCsrBGScanRequest *pScanReq);
 
@@ -555,69 +555,69 @@ eHalStatus sme_ScanSetBGScanparams(tHalHandle hHal, tANI_U8 sessionId, tCsrBGSca
     \brief a wrapper function to request scan results from CSR.
     \param pFilter - If pFilter is NULL, all cached results are returned
     \param phResult - an object for the result.
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_ScanGetResult(tHalHandle hHal, tANI_U8 sessionId, tCsrScanResultFilter *pFilter, 
+eHalStatus sme_ScanGetResult(tHalHandle hHal, tANI_U8 sessionId, tCsrScanResultFilter *pFilter,
                             tScanResultHandle *phResult);
 
 
 /* ---------------------------------------------------------------------------
     \fn sme_ScanFlushResult
     \brief a wrapper function to request CSR to clear scan results.
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_ScanFlushResult(tHalHandle hHal, tANI_U8 sessionId);
 eHalStatus sme_ScanFlushP2PResult(tHalHandle hHal, tANI_U8 sessionId);
 
 /* ---------------------------------------------------------------------------
     \fn sme_ScanResultGetFirst
-    \brief a wrapper function to request CSR to returns the first element of 
+    \brief a wrapper function to request CSR to returns the first element of
            scan result.
     \param hScanResult - returned from csrScanGetResult
-    \return tCsrScanResultInfo * - NULL if no result     
+    \return tCsrScanResultInfo * - NULL if no result
   ---------------------------------------------------------------------------*/
-tCsrScanResultInfo *sme_ScanResultGetFirst(tHalHandle, 
+tCsrScanResultInfo *sme_ScanResultGetFirst(tHalHandle,
                                           tScanResultHandle hScanResult);
 
 /* ---------------------------------------------------------------------------
     \fn sme_ScanResultGetNext
-    \brief a wrapper function to request CSR to returns the next element of 
-           scan result. It can be called without calling csrScanResultGetFirst 
+    \brief a wrapper function to request CSR to returns the next element of
+           scan result. It can be called without calling csrScanResultGetFirst
            first
     \param hScanResult - returned from csrScanGetResult
-    \return Null if no result or reach the end     
+    \return Null if no result or reach the end
   ---------------------------------------------------------------------------*/
-tCsrScanResultInfo *sme_ScanResultGetNext(tHalHandle, 
+tCsrScanResultInfo *sme_ScanResultGetNext(tHalHandle,
                                           tScanResultHandle hScanResult);
 
 /* ---------------------------------------------------------------------------
     \fn sme_ScanResultPurge
-    \brief a wrapper function to request CSR to remove all items(tCsrScanResult) 
+    \brief a wrapper function to request CSR to remove all items(tCsrScanResult)
            in the list and free memory for each item
-    \param hScanResult - returned from csrScanGetResult. hScanResult is 
-                         considered gone by 
+    \param hScanResult - returned from csrScanGetResult. hScanResult is
+                         considered gone by
     calling this function and even before this function reutrns.
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_ScanResultPurge(tHalHandle hHal, tScanResultHandle hScanResult);
 
 /* ---------------------------------------------------------------------------
     \fn sme_ScanGetPMKIDCandidateList
     \brief a wrapper function to return the PMKID candidate list
-    \param pPmkidList - caller allocated buffer point to an array of 
+    \param pPmkidList - caller allocated buffer point to an array of
                         tPmkidCandidateInfo
-    \param pNumItems - pointer to a variable that has the number of 
-                       tPmkidCandidateInfo allocated when retruning, this is 
-                       either the number needed or number of items put into 
+    \param pNumItems - pointer to a variable that has the number of
+                       tPmkidCandidateInfo allocated when retruning, this is
+                       either the number needed or number of items put into
                        pPmkidList
-    \return eHalStatus - when fail, it usually means the buffer allocated is not 
+    \return eHalStatus - when fail, it usually means the buffer allocated is not
                          big enough and pNumItems
     has the number of tPmkidCandidateInfo.
-    \Note: pNumItems is a number of tPmkidCandidateInfo, 
+    \Note: pNumItems is a number of tPmkidCandidateInfo,
            not sizeof(tPmkidCandidateInfo) * something
   ---------------------------------------------------------------------------*/
 eHalStatus sme_ScanGetPMKIDCandidateList(tHalHandle hHal, tANI_U8 sessionId,
-                                        tPmkidCandidateInfo *pPmkidList, 
+                                        tPmkidCandidateInfo *pPmkidList,
                                         tANI_U32 *pNumItems );
 
 
@@ -625,8 +625,8 @@ eHalStatus sme_ScanGetPMKIDCandidateList(tHalHandle hHal, tANI_U8 sessionId,
   \fn sme_RoamRegisterLinkQualityIndCallback
 
   \brief
-  a wrapper function to allow HDD to register a callback handler with CSR for 
-  link quality indications. 
+  a wrapper function to allow HDD to register a callback handler with CSR for
+  link quality indications.
 
   Only one callback may be registered at any time.
   In order to deregister the callback, a NULL cback may be provided.
@@ -635,13 +635,13 @@ eHalStatus sme_ScanGetPMKIDCandidateList(tHalHandle hHal, tANI_U8 sessionId,
 
   \param callback - Call back being registered
   \param pContext - user data
-  
+
   DEPENDENCIES: After CSR open
 
-  \return eHalStatus  
+  \return eHalStatus
 -----------------------------------------------------------------------------*/
 eHalStatus sme_RoamRegisterLinkQualityIndCallback(tHalHandle hHal, tANI_U8 sessionId,
-                                                  csrRoamLinkQualityIndCallback   callback,  
+                                                  csrRoamLinkQualityIndCallback   callback,
                                                   void                           *pContext);
 
 
@@ -651,22 +651,22 @@ eHalStatus sme_RoamRegisterLinkQualityIndCallback(tHalHandle hHal, tANI_U8 sessi
     \param sessionId - the sessionId returned by sme_OpenSession.
     \param pProfile - can be NULL to join to any open ones
     \param pRoamId - to get back the request ID
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_RoamConnect(tHalHandle hHal, tANI_U8 sessionId, tCsrRoamProfile *pProfile, 
+eHalStatus sme_RoamConnect(tHalHandle hHal, tANI_U8 sessionId, tCsrRoamProfile *pProfile,
                            tANI_U32 *pRoamId);
 
 /* ---------------------------------------------------------------------------
     \fn sme_RoamReassoc
     \brief a wrapper function to request CSR to inititiate a re-association
-    \param pProfile - can be NULL to join the currently connected AP. In that 
+    \param pProfile - can be NULL to join the currently connected AP. In that
     case modProfileFields should carry the modified field(s) which could trigger
-    reassoc  
-    \param modProfileFields - fields which are part of tCsrRoamConnectedProfile 
-    that might need modification dynamically once STA is up & running and this 
+    reassoc
+    \param modProfileFields - fields which are part of tCsrRoamConnectedProfile
+    that might need modification dynamically once STA is up & running and this
     could trigger a reassoc
     \param pRoamId - to get back the request ID
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus sme_RoamReassoc(tHalHandle hHal, tANI_U8 sessionId, tCsrRoamProfile *pProfile,
                           tCsrRoamModifyProfileFields modProfileFields,
@@ -674,18 +674,18 @@ eHalStatus sme_RoamReassoc(tHalHandle hHal, tANI_U8 sessionId, tCsrRoamProfile *
 
 /* ---------------------------------------------------------------------------
     \fn sme_RoamConnectToLastProfile
-    \brief a wrapper function to request CSR to disconnect and reconnect with 
+    \brief a wrapper function to request CSR to disconnect and reconnect with
            the same profile
-    \return eHalStatus. It returns fail if currently connected     
+    \return eHalStatus. It returns fail if currently connected
   ---------------------------------------------------------------------------*/
 eHalStatus sme_RoamConnectToLastProfile(tHalHandle hHal, tANI_U8 sessionId);
 
 /* ---------------------------------------------------------------------------
     \fn sme_RoamDisconnect
     \brief a wrapper function to request CSR to disconnect from a network
-    \param reason -- To indicate the reason for disconnecting. Currently, only 
+    \param reason -- To indicate the reason for disconnecting. Currently, only
                      eCSR_DISCONNECT_REASON_MIC_ERROR is meanful.
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_RoamDisconnect(tHalHandle hHal, tANI_U8 sessionId, eCsrRoamDisconnectReason reason);
 
@@ -693,7 +693,7 @@ eHalStatus sme_RoamDisconnect(tHalHandle hHal, tANI_U8 sessionId, eCsrRoamDiscon
     \fn sme_RoamStopBss
     \brief a wrapper function to request CSR to stop bss
     \param sessionId    - sessionId of SoftAP
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_RoamStopBss(tHalHandle hHal, tANI_U8 sessionId);
 
@@ -727,7 +727,7 @@ eHalStatus sme_RoamDisconnectSta(tHalHandle hHal, tANI_U8 sessionId, tANI_U8 *pP
     \param hHal - Global structure
     \param sessionId - sessionId of SoftAP
     \param pPeerMacAddr - Caller allocated memory filled with peer MAC address (6 bytes)
-    \return eHalStatus  SUCCESS  Roam callback will be called to indicate actual results    
+    \return eHalStatus  SUCCESS  Roam callback will be called to indicate actual results
   -------------------------------------------------------------------------------*/
 eHalStatus sme_RoamDeauthSta(tHalHandle hHal, tANI_U8 sessionId,
                                 tANI_U8 *pPeerMacAddr);
@@ -737,7 +737,7 @@ eHalStatus sme_RoamDeauthSta(tHalHandle hHal, tANI_U8 sessionId,
     \brief To start or stop TKIP counter measures. This is an asynchronous API.
     \param sessionId - sessionId of SoftAP
     \param bEnable - Flag to start/stop TKIP countermeasures
-    \return eHalStatus  SUCCESS  Roam callback will be called to indicate actual results    
+    \return eHalStatus  SUCCESS  Roam callback will be called to indicate actual results
   -------------------------------------------------------------------------------*/
 eHalStatus sme_RoamTKIPCounterMeasures(tHalHandle hHal, tANI_U8 sessionId, tANI_BOOLEAN bEnable);
 
@@ -756,50 +756,50 @@ eHalStatus sme_RoamGetWpsSessionOverlap(tHalHandle hHal, tANI_U8 sessionId,
 
 /* ---------------------------------------------------------------------------
     \fn sme_RoamGetConnectState
-    \brief a wrapper function to request CSR to return the current connect state 
+    \brief a wrapper function to request CSR to return the current connect state
            of Roaming
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_RoamGetConnectState(tHalHandle hHal, tANI_U8 sessionId, eCsrConnectState *pState);
 
 /* ---------------------------------------------------------------------------
     \fn sme_RoamGetConnectProfile
-    \brief a wrapper function to request CSR to return the current connect 
-           profile. Caller must call csrRoamFreeConnectProfile after it is done 
+    \brief a wrapper function to request CSR to return the current connect
+           profile. Caller must call csrRoamFreeConnectProfile after it is done
            and before reuse for another csrRoamGetConnectProfile call.
-    \param pProfile - pointer to a caller allocated structure 
+    \param pProfile - pointer to a caller allocated structure
                       tCsrRoamConnectedProfile
-    \return eHalStatus. Failure if not connected     
+    \return eHalStatus. Failure if not connected
   ---------------------------------------------------------------------------*/
 eHalStatus sme_RoamGetConnectProfile(tHalHandle hHal, tANI_U8 sessionId,
                                      tCsrRoamConnectedProfile *pProfile);
 
 /* ---------------------------------------------------------------------------
     \fn sme_RoamFreeConnectProfile
-    \brief a wrapper function to request CSR to free and reinitialize the 
+    \brief a wrapper function to request CSR to free and reinitialize the
            profile returned previously by csrRoamGetConnectProfile.
-    \param pProfile - pointer to a caller allocated structure 
+    \param pProfile - pointer to a caller allocated structure
                       tCsrRoamConnectedProfile
-    \return eHalStatus.      
+    \return eHalStatus.
   ---------------------------------------------------------------------------*/
-eHalStatus sme_RoamFreeConnectProfile(tHalHandle hHal, 
+eHalStatus sme_RoamFreeConnectProfile(tHalHandle hHal,
                                       tCsrRoamConnectedProfile *pProfile);
 
 /* ---------------------------------------------------------------------------
     \fn sme_RoamSetPMKIDCache
     \brief a wrapper function to request CSR to return the PMKID candidate list
-    \param pPMKIDCache - caller allocated buffer point to an array of 
+    \param pPMKIDCache - caller allocated buffer point to an array of
                          tPmkidCacheInfo
-    \param numItems - a variable that has the number of tPmkidCacheInfo 
-                      allocated when retruning, this is either the number needed 
+    \param numItems - a variable that has the number of tPmkidCacheInfo
+                      allocated when retruning, this is either the number needed
                       or number of items put into pPMKIDCache
-    \return eHalStatus - when fail, it usually means the buffer allocated is not 
-                         big enough and pNumItems has the number of 
+    \return eHalStatus - when fail, it usually means the buffer allocated is not
+                         big enough and pNumItems has the number of
                          tPmkidCacheInfo.
-    \Note: pNumItems is a number of tPmkidCacheInfo, 
+    \Note: pNumItems is a number of tPmkidCacheInfo,
            not sizeof(tPmkidCacheInfo) * something
   ---------------------------------------------------------------------------*/
-eHalStatus sme_RoamSetPMKIDCache( tHalHandle hHal, tANI_U8 sessionId, tPmkidCacheInfo *pPMKIDCache, 
+eHalStatus sme_RoamSetPMKIDCache( tHalHandle hHal, tANI_U8 sessionId, tPmkidCacheInfo *pPMKIDCache,
                                   tANI_U32 numItems );
 
 /* ---------------------------------------------------------------------------
@@ -808,12 +808,12 @@ eHalStatus sme_RoamSetPMKIDCache( tHalHandle hHal, tANI_U8 sessionId, tPmkidCach
            passes to PE to JOIN request or START_BSS request
     This is a synchronuous call.
     \param sessionId - returned by sme_OpenSession.
-    \param pLen - caller allocated memory that has the length of pBuf as input. 
+    \param pLen - caller allocated memory that has the length of pBuf as input.
                   Upon returned, *pLen has the needed or IE length in pBuf.
-    \param pBuf - Caller allocated memory that contain the IE field, if any, 
+    \param pBuf - Caller allocated memory that contain the IE field, if any,
                   upon return
-    \param secType - Specifies whether looking for WPA/WPA2/WAPI IE                  
-    \return eHalStatus - when fail, it usually means the buffer allocated is not 
+    \param secType - Specifies whether looking for WPA/WPA2/WAPI IE
+    \return eHalStatus - when fail, it usually means the buffer allocated is not
                          big enough
   ---------------------------------------------------------------------------*/
 eHalStatus sme_RoamGetSecurityReqIE(tHalHandle hHal, tANI_U8 sessionId, tANI_U32 *pLen,
@@ -821,15 +821,15 @@ eHalStatus sme_RoamGetSecurityReqIE(tHalHandle hHal, tANI_U8 sessionId, tANI_U32
 
 /* ---------------------------------------------------------------------------
     \fn sme_RoamGetSecurityRspIE
-    \brief a wrapper function to request CSR to return the WPA or RSN or WAPI IE from 
+    \brief a wrapper function to request CSR to return the WPA or RSN or WAPI IE from
            the beacon or probe rsp if connected
     \param sessionId - returned by sme_OpenSession.
-    \param pLen - caller allocated memory that has the length of pBuf as input. 
+    \param pLen - caller allocated memory that has the length of pBuf as input.
                   Upon returned, *pLen has the needed or IE length in pBuf.
-    \param pBuf - Caller allocated memory that contain the IE field, if any, 
+    \param pBuf - Caller allocated memory that contain the IE field, if any,
                   upon return
-    \param secType - Specifies whether looking for WPA/WPA2/WAPI IE                                       
-    \return eHalStatus - when fail, it usually means the buffer allocated is not 
+    \param secType - Specifies whether looking for WPA/WPA2/WAPI IE
+    \return eHalStatus - when fail, it usually means the buffer allocated is not
                          big enough
   ---------------------------------------------------------------------------*/
 eHalStatus sme_RoamGetSecurityRspIE(tHalHandle hHal, tANI_U8 sessionId, tANI_U32 *pLen,
@@ -838,7 +838,7 @@ eHalStatus sme_RoamGetSecurityRspIE(tHalHandle hHal, tANI_U8 sessionId, tANI_U32
 
 /* ---------------------------------------------------------------------------
     \fn sme_RoamGetNumPMKIDCache
-    \brief a wrapper function to request CSR to return number of PMKID cache 
+    \brief a wrapper function to request CSR to return number of PMKID cache
            entries
     \return tANI_U32 - the number of PMKID cache entries
   ---------------------------------------------------------------------------*/
@@ -847,34 +847,34 @@ tANI_U32 sme_RoamGetNumPMKIDCache(tHalHandle hHal, tANI_U8 sessionId);
 /* ---------------------------------------------------------------------------
     \fn sme_RoamGetPMKIDCache
     \brief a wrapper function to request CSR to return PMKID cache from CSR
-    \param pNum - caller allocated memory that has the space of the number of 
-                  pBuf tPmkidCacheInfo as input. Upon returned, *pNum has the 
+    \param pNum - caller allocated memory that has the space of the number of
+                  pBuf tPmkidCacheInfo as input. Upon returned, *pNum has the
                   needed or actually number in tPmkidCacheInfo.
-    \param pPmkidCache - Caller allocated memory that contains PMKID cache, if 
+    \param pPmkidCache - Caller allocated memory that contains PMKID cache, if
                          any, upon return
-    \return eHalStatus - when fail, it usually means the buffer allocated is not 
+    \return eHalStatus - when fail, it usually means the buffer allocated is not
                          big enough
   ---------------------------------------------------------------------------*/
-eHalStatus sme_RoamGetPMKIDCache(tHalHandle hHal, tANI_U8 sessionId, tANI_U32 *pNum, 
+eHalStatus sme_RoamGetPMKIDCache(tHalHandle hHal, tANI_U8 sessionId, tANI_U32 *pNum,
                                  tPmkidCacheInfo *pPmkidCache);
 
 /* ---------------------------------------------------------------------------
     \fn sme_GetConfigParam
-    \brief a wrapper function that HDD calls to get the global settings 
-           currently maintained by CSR. 
+    \brief a wrapper function that HDD calls to get the global settings
+           currently maintained by CSR.
     \param pParam - caller allocated memory
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_GetConfigParam(tHalHandle hHal, tSmeConfigParams *pParam);
 
 /* ---------------------------------------------------------------------------
     \fn sme_GetStatistics
-    \brief a wrapper function that client calls to register a callback to get 
-    different PHY level statistics from CSR. 
-    
+    \brief a wrapper function that client calls to register a callback to get
+    different PHY level statistics from CSR.
+
     \param requesterId - different client requesting for statistics, HDD, UMA/GAN etc
     \param statsMask - The different category/categories of stats requester is looking for
-    The order in which you set the bits in the statsMask for requesting 
+    The order in which you set the bits in the statsMask for requesting
     different type of stats is:
 
       eCsrSummaryStats = bit 0
@@ -885,18 +885,18 @@ eHalStatus sme_GetConfigParam(tHalHandle hHal, tSmeConfigParams *pParam);
       eCsrPerStaStats = bit 5
 
     \param callback - SME sends back the requested stats using the callback
-    \param periodicity - If requester needs periodic update, 0 means it's an one 
+    \param periodicity - If requester needs periodic update, 0 means it's an one
                          time request
     \param cache - If requester is happy with cached stats
     \param staId - The station ID for which the stats is requested for
     \param pContext - user context to be passed back along with the callback
     \param sessionId - sme session interface
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_GetStatistics(tHalHandle hHal, eCsrStatsRequesterType requesterId, 
-                             tANI_U32 statsMask, 
-                             tCsrStatsCallback callback, 
-                             tANI_U32 periodicity, tANI_BOOLEAN cache, 
+eHalStatus sme_GetStatistics(tHalHandle hHal, eCsrStatsRequesterType requesterId,
+                             tANI_U32 statsMask,
+                             tCsrStatsCallback callback,
+                             tANI_U32 periodicity, tANI_BOOLEAN cache,
                              tANI_U8 staId, void *pContext, tANI_U8 sessionId);
 
 /* ---------------------------------------------------------------------------
@@ -909,8 +909,8 @@ eHalStatus sme_GetStatistics(tHalHandle hHal, eCsrStatsRequesterType requesterId
   ---------------------------------------------------------------------------*/
 tANI_U16 smeGetTLSTAState(tHalHandle hHal, tANI_U8 staId);
 
-eHalStatus sme_GetRssi(tHalHandle hHal, 
-                             tCsrRssiCallback callback, 
+eHalStatus sme_GetRssi(tHalHandle hHal,
+                             tCsrRssiCallback callback,
                              tANI_U8 staId, tCsrBssid bssId, void *pContext, void* pVosContext);
 
 /* ---------------------------------------------------------------------------
@@ -978,52 +978,52 @@ eHalStatus sme_SetCcxBeaconRequest(tHalHandle hHal, const tANI_U8 sessionId,
 
 /* ---------------------------------------------------------------------------
     \fn sme_CfgSetInt
-    \brief a wrapper function that HDD calls to set parameters in CFG. 
-    \param cfgId - Configuration Parameter ID (type) for STA. 
+    \brief a wrapper function that HDD calls to set parameters in CFG.
+    \param cfgId - Configuration Parameter ID (type) for STA.
     \param ccmValue - The information related to Configuration Parameter ID
                       which needs to be saved in CFG
-    \param callback - To be registered by CSR with CCM. Once the CFG done with 
-                      saving the information in the database, it notifies CCM & 
-                      then the callback will be invoked to notify. 
+    \param callback - To be registered by CSR with CCM. Once the CFG done with
+                      saving the information in the database, it notifies CCM &
+                      then the callback will be invoked to notify.
     \param toBeSaved - To save the request for future reference
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_CfgSetInt(tHalHandle hHal, tANI_U32 cfgId, tANI_U32 ccmValue, 
+eHalStatus sme_CfgSetInt(tHalHandle hHal, tANI_U32 cfgId, tANI_U32 ccmValue,
                          tCcmCfgSetCallback callback, eAniBoolean toBeSaved) ;
 
 /* ---------------------------------------------------------------------------
     \fn sme_CfgSetStr
-    \brief a wrapper function that HDD calls to set parameters in CFG. 
-    \param cfgId - Configuration Parameter ID (type) for STA. 
-    \param pStr - Pointer to the byte array which carries the information needs 
+    \brief a wrapper function that HDD calls to set parameters in CFG.
+    \param cfgId - Configuration Parameter ID (type) for STA.
+    \param pStr - Pointer to the byte array which carries the information needs
                   to be saved in CFG
-    \param length - Length of the data to be saved                  
-    \param callback - To be registered by CSR with CCM. Once the CFG done with 
-                      saving the information in the database, it notifies CCM & 
-                      then the callback will be invoked to notify. 
+    \param length - Length of the data to be saved
+    \param callback - To be registered by CSR with CCM. Once the CFG done with
+                      saving the information in the database, it notifies CCM &
+                      then the callback will be invoked to notify.
     \param toBeSaved - To save the request for future reference
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_CfgSetStr(tHalHandle hHal, tANI_U32 cfgId, tANI_U8 *pStr, 
-                         tANI_U32 length, tCcmCfgSetCallback callback, 
+eHalStatus sme_CfgSetStr(tHalHandle hHal, tANI_U32 cfgId, tANI_U8 *pStr,
+                         tANI_U32 length, tCcmCfgSetCallback callback,
                          eAniBoolean toBeSaved) ;
 
 
 /* ---------------------------------------------------------------------------
     \fn sme_GetModifyProfileFields
-    \brief HDD or SME - QOS calls this function to get the current values of 
+    \brief HDD or SME - QOS calls this function to get the current values of
     connected profile fields, changing which can cause reassoc.
     This function must be called after CFG is downloaded and STA is in connected
     state. Also, make sure to call this function to get the current profile
     fields before calling the reassoc. So that pModifyProfileFields will have
     all the latest values plus the one(s) has been updated as part of reassoc
     request.
-    \param pModifyProfileFields - pointer to the connected profile fields 
+    \param pModifyProfileFields - pointer to the connected profile fields
     changing which can cause reassoc
 
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
-eHalStatus sme_GetModifyProfileFields(tHalHandle hHal, tANI_U8 sessionId, 
+eHalStatus sme_GetModifyProfileFields(tHalHandle hHal, tANI_U8 sessionId,
                                      tCsrRoamModifyProfileFields * pModifyProfileFields);
 
 
@@ -1032,13 +1032,13 @@ eHalStatus sme_GetModifyProfileFields(tHalHandle hHal, tANI_U8 sessionId,
     \brief  Wrapper fn to change power save configuration in SME (PMC) module.
             For BMPS related configuration, this function also updates the CFG
             and sends a message to FW to pick up the new values. Note: Calling
-            this function only updates the configuration and does not enable 
+            this function only updates the configuration and does not enable
             the specified power save mode.
     \param  hHal - The handle returned by macOpen.
     \param  psMode - Power Saving mode being modified
     \param  pConfigParams - a pointer to a caller allocated object of type
-            tPmcSmpsConfigParams or tPmcBmpsConfigParams or tPmcImpsConfigParams 
-    \return eHalStatus   
+            tPmcSmpsConfigParams or tPmcBmpsConfigParams or tPmcImpsConfigParams
+    \return eHalStatus
   --------------------------------------------------------------------------*/
 eHalStatus sme_SetConfigPowerSave(tHalHandle hHal, tPmcPowerSavingMode psMode,
                                   void *pConfigParams);
@@ -1049,8 +1049,8 @@ eHalStatus sme_SetConfigPowerSave(tHalHandle hHal, tPmcPowerSavingMode psMode,
     \param  hHal - The handle returned by macOpen.
     \param  psMode - Power Saving mode
     \param  pConfigParams - a pointer to a caller allocated object of type
-            tPmcSmpsConfigParams or tPmcBmpsConfigParams or tPmcImpsConfigParams 
-    \return eHalStatus   
+            tPmcSmpsConfigParams or tPmcBmpsConfigParams or tPmcImpsConfigParams
+    \return eHalStatus
   --------------------------------------------------------------------------*/
 eHalStatus sme_GetConfigPowerSave(tHalHandle hHal, tPmcPowerSavingMode psMode,
                                   void *pConfigParams);
@@ -1061,7 +1061,7 @@ eHalStatus sme_GetConfigPowerSave(tHalHandle hHal, tPmcPowerSavingMode psMode,
             the chip into deep sleep mode.
     \param  hHal - The handle returned by macOpen.
     \param  event - the event that has occurred
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_SignalPowerEvent (
    tHalHandle hHal,
@@ -1073,7 +1073,7 @@ extern eHalStatus sme_SignalPowerEvent (
             device state change. This is purely a configuration API.
     \param  hHal - The handle returned by macOpen.
     \param  psMode - The power saving mode to enable.
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_EnablePowerSave (
    tHalHandle hHal,
@@ -1082,11 +1082,11 @@ extern eHalStatus sme_EnablePowerSave (
 /* ---------------------------------------------------------------------------
     \fn sme_DisablePowerSave
     \brief   Disables one of the power saving modes.Disabling does not imply
-             that device will be brought out of the current PS mode. This is 
+             that device will be brought out of the current PS mode. This is
              purely a configuration API.
     \param  hHal - The handle returned by macOpen.
-    \param  psMode - The power saving mode to disable. 
-    \return eHalStatus     
+    \param  psMode - The power saving mode to disable.
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_DisablePowerSave (
    tHalHandle hHal,
@@ -1109,7 +1109,7 @@ extern eHalStatus sme_SetHostPowerSave (
             module for entry into Bmps mode. This timer is started only if BMPS is
             enabled and whenever the device is in full power.
     \param  hHal - The handle returned by macOpen.
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_StartAutoBmpsTimer ( tHalHandle hHal);
 
@@ -1119,7 +1119,7 @@ extern eHalStatus sme_StartAutoBmpsTimer ( tHalHandle hHal);
             Stopping the timer does not cause a device state change. Only the timer
             is stopped. If "Full Power" is desired, use the sme_RequestFullPower API
     \param  hHal - The handle returned by macOpen.
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_StopAutoBmpsTimer ( tHalHandle hHal);
 
@@ -1129,7 +1129,7 @@ extern eHalStatus sme_StopAutoBmpsTimer ( tHalHandle hHal);
     \param  hHal - The handle returned by macOpen.
     \param pPowerState - pointer to location to return power state
     \param pSwWlanSwitchState - ptr to location to return SW WLAN Switch state
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_QueryPowerState (
    tHalHandle hHal,
@@ -1143,7 +1143,7 @@ extern eHalStatus sme_QueryPowerState (
     \param  hHal - The handle returned by macOpen.
     \param sessionId - sme sessionid
     \param psMode - the power saving mode
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 extern tANI_BOOLEAN sme_IsPowerSaveEnabled (
    tHalHandle hHal,
@@ -1156,20 +1156,20 @@ extern tANI_BOOLEAN sme_IsPowerSaveEnabled (
             Note 1: If "fullPowerReason" specificied in this API is set to
             eSME_FULL_PWR_NEEDED_BY_HDD, PMC will clear any "buffered wowl" requests
             and also clear any "buffered BMPS requests by HDD". Assumption is that since
-            HDD is requesting full power, we need to undo any previous HDD requests for 
+            HDD is requesting full power, we need to undo any previous HDD requests for
             BMPS (using sme_RequestBmps) or WoWL (using sme_EnterWoWL). If the reason is
             specified anything other than above, the buffered requests for BMPS and WoWL
             will not be cleared.
             Note 2: Requesting full power (no matter what the fullPowerReason is) doesn't
             disable the "auto bmps timer" (if it is enabled) or clear any "buffered uapsd
             request".
-            Note 3: When the device finally enters Full Power PMC will start a timer 
+            Note 3: When the device finally enters Full Power PMC will start a timer
             if any of the following holds true:
             - Auto BMPS mode is enabled
             - Uapsd request is pending
             - HDD's request for BMPS is pending
             - HDD's request for WoWL is pending
-            On timer expiry PMC will attempt to put the device in BMPS mode if following 
+            On timer expiry PMC will attempt to put the device in BMPS mode if following
             (in addition to those listed above) holds true:
             - Polling of all modules through the Power Save Check routine passes
             - STA is associated to an access point
@@ -1178,7 +1178,7 @@ extern tANI_BOOLEAN sme_IsPowerSaveEnabled (
     \param  - callbackContext -  Cookie to be passed back during callback
     \param  - fullPowerReason - Reason why this API is being invoked. SME needs to
               distinguish between BAP and HDD requests
-    \return eHalStatus - status 
+    \return eHalStatus - status
      eHAL_STATUS_SUCCESS - device brought to full power state
      eHAL_STATUS_FAILURE - device cannot be brought to full power state
      eHAL_STATUS_PMC_PENDING - device is being brought to full power state,
@@ -1191,7 +1191,7 @@ extern eHalStatus sme_RequestFullPower (
 
 /* ---------------------------------------------------------------------------
     \fn sme_RequestBmps
-    \brief  Request that the device be put in BMPS state. Request will be 
+    \brief  Request that the device be put in BMPS state. Request will be
             accepted only if BMPS mode is enabled and power save check routine
             passes. Only HDD should invoke this API.
     \param  hHal - The handle returned by macOpen.
@@ -1209,7 +1209,7 @@ extern eHalStatus sme_RequestBmps (
 
 /* ---------------------------------------------------------------------------
     \fn  sme_SetDHCPTillPowerActiveFlag
-    \brief  Sets/Clears DHCP related flag in PMC to disable/enable auto BMPS 
+    \brief  Sets/Clears DHCP related flag in PMC to disable/enable auto BMPS
             entry by PMC
     \param  hHal - The handle returned by macOpen.
   ---------------------------------------------------------------------------*/
@@ -1228,7 +1228,7 @@ void  sme_SetDHCPTillPowerActiveFlag(tHalHandle hHal, tANI_U8 flag);
       eHAL_STATUS_FAILURE - device cannot be brought to UAPSD state
       eHAL_STATUS_PMC_PENDING - device is being brought to UAPSD state
       eHAL_STATUS_PMC_DISABLED - UAPSD is disabled or BMPS mode is disabled
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_StartUapsd (
    tHalHandle hHal,
@@ -1241,7 +1241,7 @@ extern eHalStatus sme_StartUapsd (
             put in in BMPS state after stop UAPSD completes. Buffered requests for
             UAPSD will be cleared after this.
     \param  hHal - The handle returned by macOpen.
-    \return eHalStatus  
+    \return eHalStatus
       eHAL_STATUS_SUCCESS - device is put out of UAPSD and back in BMPS state
       eHAL_STATUS_FAILURE - device cannot be brought out of UAPSD state
   ---------------------------------------------------------------------------*/
@@ -1256,7 +1256,7 @@ extern eHalStatus sme_StopUapsd (tHalHandle hHal);
     \param  hHal - The handle returned by macOpen.
     \param  - callbackRoutine Callback routine invoked in case of success/failure
     \param  - callbackContext -  Cookie to be passed back during callback
-    \return eHalStatus  
+    \return eHalStatus
       eHAL_STATUS_SUCCESS - device is in Standby mode
       eHAL_STATUS_FAILURE - device cannot be put in standby mode
       eHAL_STATUS_PMC_PENDING - device is being put in standby mode
@@ -1275,10 +1275,10 @@ extern eHalStatus sme_RequestStandby (
     \param  callbackContext -  Cookie to be passed back during callback
     \return eHalStatus
             eHAL_STATUS_SUCCESS - successfully registered
-            eHAL_STATUS_FAILURE - not successfully registered  
+            eHAL_STATUS_FAILURE - not successfully registered
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_RegisterPowerSaveCheck (
-   tHalHandle hHal, 
+   tHalHandle hHal,
    tANI_BOOLEAN (*checkRoutine) (void *checkContext), void *checkContext);
 
 /* ---------------------------------------------------------------------------
@@ -1288,10 +1288,10 @@ extern eHalStatus sme_RegisterPowerSaveCheck (
     \param  checkRoutine -  Power save check routine to be deregistered
     \return eHalStatus
             eHAL_STATUS_SUCCESS - successfully deregistered
-            eHAL_STATUS_FAILURE - not successfully deregistered  
+            eHAL_STATUS_FAILURE - not successfully deregistered
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_DeregisterPowerSaveCheck (
-   tHalHandle hHal, 
+   tHalHandle hHal,
    tANI_BOOLEAN (*checkRoutine) (void *checkContext));
 
 /* ---------------------------------------------------------------------------
@@ -1303,10 +1303,10 @@ extern eHalStatus sme_DeregisterPowerSaveCheck (
     \param  callbackContext -  Cookie to be passed back during callback
     \return eHalStatus
             eHAL_STATUS_SUCCESS - successfully registered
-            eHAL_STATUS_FAILURE - not successfully registered  
+            eHAL_STATUS_FAILURE - not successfully registered
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_RegisterDeviceStateUpdateInd (
-   tHalHandle hHal, 
+   tHalHandle hHal,
    void (*callbackRoutine) (void *callbackContext, tPmcState pmcState),
    void *callbackContext);
 
@@ -1317,10 +1317,10 @@ extern eHalStatus sme_RegisterDeviceStateUpdateInd (
     \param  callbackRoutine -  Callback routine to be deregistered
     \return eHalStatus
             eHAL_STATUS_SUCCESS - successfully deregistered
-            eHAL_STATUS_FAILURE - not successfully deregistered  
+            eHAL_STATUS_FAILURE - not successfully deregistered
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_DeregisterDeviceStateUpdateInd (
-   tHalHandle hHal, 
+   tHalHandle hHal,
    void (*callbackRoutine) (void *callbackContext, tPmcState pmcState));
 
 /* ---------------------------------------------------------------------------
@@ -1332,10 +1332,10 @@ extern eHalStatus sme_DeregisterDeviceStateUpdateInd (
     \param  pattern -  Pattern to be added
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot add pattern
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_WowlAddBcastPattern (
-   tHalHandle hHal, 
+   tHalHandle hHal,
    tpSirWowlAddBcastPtrn pattern,
    tANI_U8 sessionId);
 
@@ -1346,17 +1346,17 @@ extern eHalStatus sme_WowlAddBcastPattern (
     \param  pattern -  Pattern to be deleted
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot delete pattern
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_WowlDelBcastPattern (
-   tHalHandle hHal, 
+   tHalHandle hHal,
    tpSirWowlDelBcastPtrn pattern,
    tANI_U8   sessionId);
 
 /* ---------------------------------------------------------------------------
     \fn sme_EnterWowl
-    \brief  This is the API to request entry into WOWL mode. 
-            WoWLAN works on top of BMPS mode. If the device is not in BMPS mode, 
+    \brief  This is the API to request entry into WOWL mode.
+            WoWLAN works on top of BMPS mode. If the device is not in BMPS mode,
             SME will will cache the information that WOWL has been requested and
             attempt to put the device in BMPS first. On entry into BMPS, SME will
             enter the WOWL mode.
@@ -1371,7 +1371,7 @@ extern eHalStatus sme_WowlDelBcastPattern (
             and WOWL at the same time.
             Note 4. Request for WoWL is rejected if there is a pending UAPSD request.
             Note 5. Request for WoWL is rejected if BMPS is disabled.
-            
+
     \param  hHal - The handle returned by macOpen.
     \param  enterWowlCallbackRoutine -  Callback routine provided by HDD.
                                Used for success/failure notification by SME
@@ -1399,8 +1399,8 @@ extern eHalStatus sme_EnterWowl (
 
 /* ---------------------------------------------------------------------------
     \fn sme_ExitWowl
-    \brief  This is the SME API exposed to HDD to request exit from WoWLAN mode. 
-            SME will initiate exit from WoWLAN mode and device will be put in BMPS 
+    \brief  This is the SME API exposed to HDD to request exit from WoWLAN mode.
+            SME will initiate exit from WoWLAN mode and device will be put in BMPS
             mode. Any Buffered request for WoWL will be cleared after this API.
     \param  hHal - The handle returned by macOpen.
     \param  wowlExitParams - Carries info on which smesession wowl exit
@@ -1409,7 +1409,7 @@ extern eHalStatus sme_EnterWowl (
             eHAL_STATUS_FAILURE  Device cannot exit WoWLAN mode. This can happen
                                   only if the previous "Enter WOWL" transaction has
                                   not even completed.
-            eHAL_STATUS_SUCCESS  Request accepted to exit WoWLAN mode. 
+            eHAL_STATUS_SUCCESS  Request accepted to exit WoWLAN mode.
   ---------------------------------------------------------------------------*/
 extern eHalStatus sme_ExitWowl (tHalHandle hHal, tpSirSmeWowlExitParams wowlExitParams);
 
@@ -1453,7 +1453,7 @@ eHalStatus sme_RoamRemoveKey(tHalHandle, tANI_U8 sessionId, tCsrRoamRemoveKey *p
 
     \fn sme_GetCountryCode
 
-    \brief To return the current country code. If no country code is applied, default country code is 
+    \brief To return the current country code. If no country code is applied, default country code is
     used to fill the buffer.
     If 11d supported is turned off, an error is return and the last applied/default country code is used.
     This is a synchronous API.
@@ -1476,7 +1476,7 @@ eHalStatus sme_GetCountryCode(tHalHandle hHal, tANI_U8 *pBuf, tANI_U8 *pbLen);
 
     \fn sme_SetCountryCode
 
-    \brief To change the current/default country code. 
+    \brief To change the current/default country code.
     If 11d supported is turned off, an error is return.
     This is a synchronous API.
 
@@ -1496,21 +1496,21 @@ eHalStatus sme_SetCountryCode(tHalHandle hHal, tANI_U8 *pCountry, tANI_BOOLEAN *
     \fn sme_ResetCountryCodeInformation
     \brief this function is to reset the country code current being used back to EEPROM default
     this includes channel list and power setting. This is a synchronous API.
-    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether 
+    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether
     a restart is needed to apply the change
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus sme_ResetCountryCodeInformation(tHalHandle hHal, tANI_BOOLEAN *pfRestartNeeded);
 
 /* ---------------------------------------------------------------------------
     \fn sme_GetSupportedCountryCode
     \brief this function is to get a list of the country code current being supported
-    \param pBuf - Caller allocated buffer with at least 3 bytes, upon success return, 
+    \param pBuf - Caller allocated buffer with at least 3 bytes, upon success return,
     this has the country code list. 3 bytes for each country code. This may be NULL if
     caller wants to know the needed byte count.
     \param pbLen - Caller allocated, as input, it indicates the length of pBuf. Upon success return,
     this contains the length of the data in pBuf. If pbuf is NULL, as input, *pbLen should be 0.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus sme_GetSupportedCountryCode(tHalHandle hHal, tANI_U8 *pBuf, tANI_U32 *pbLen);
 
@@ -1522,7 +1522,7 @@ eHalStatus sme_GetSupportedCountryCode(tHalHandle hHal, tANI_U8 *pBuf, tANI_U32
     \param pDomain - Caller allocated buffer to return the current domain.
     \return eHalStatus  SUCCESS.
 
-                         FAILURE or RESOURCES  The API finished and failed.     
+                         FAILURE or RESOURCES  The API finished and failed.
   -------------------------------------------------------------------------------*/
 eHalStatus sme_GetCurrentRegulatoryDomain(tHalHandle hHal, v_REGDOMAIN_t *pDomain);
 
@@ -1531,11 +1531,11 @@ eHalStatus sme_GetCurrentRegulatoryDomain(tHalHandle hHal, v_REGDOMAIN_t *pDomai
     \brief this function is to set the current regulatory domain.
     This function must be called after CFG is downloaded and all the band/mode setting already passed into
     SME. This is a synchronous API.
-    \param domainId - indicate the domain (defined in the driver) needs to set to.  
+    \param domainId - indicate the domain (defined in the driver) needs to set to.
     See v_REGDOMAIN_t for definition
-    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether 
+    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether
     a restart is needed to apply the change
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus sme_SetRegulatoryDomain(tHalHandle hHal, v_REGDOMAIN_t domainId, tANI_BOOLEAN *pfRestartNeeded);
 
@@ -1582,7 +1582,7 @@ eHalStatus sme_GetSupportedRegulatoryDomains(tHalHandle hHal, v_REGDOMAIN_t *pDo
 //some support functions
 tANI_BOOLEAN sme_Is11dSupported(tHalHandle hHal);
 tANI_BOOLEAN sme_Is11hSupported(tHalHandle hHal);
-tANI_BOOLEAN sme_IsWmmSupported(tHalHandle hHal); 
+tANI_BOOLEAN sme_IsWmmSupported(tHalHandle hHal);
 //Upper layer to get the list of the base channels to scan for passively 11d info from csr
 eHalStatus sme_ScanGetBaseChannels( tHalHandle hHal, tCsrChannelInfo * pChannelInfo );
 
@@ -1689,9 +1689,9 @@ eHalStatus sme_DHCPStopInd( tHalHandle hHal,
                            Caller owns the memory and is responsible for freeing it.
     \return VOS_STATUS
             VOS_STATUS_E_FAILURE  BT Event not passed to HAL. This can happen
-                                   if driver has not yet been initialized or if BTC 
+                                   if driver has not yet been initialized or if BTC
                                    Events Layer has been disabled.
-            VOS_STATUS_SUCCESS    BT Event passed to HAL 
+            VOS_STATUS_SUCCESS    BT Event passed to HAL
   ---------------------------------------------------------------------------*/
 VOS_STATUS sme_BtcSignalBtEvent (tHalHandle hHal, tpSmeBtEvent pBtcBtEvent);
 
@@ -1705,8 +1705,8 @@ VOS_STATUS sme_BtcSignalBtEvent (tHalHandle hHal, tpSmeBtEvent pBtcBtEvent);
                             tSmeBtcConfig. Caller owns the memory and is responsible
                             for freeing it.
     \return VOS_STATUS
-            VOS_STATUS_E_FAILURE  Config not passed to HAL. 
-            VOS_STATUS_SUCCESS  Config passed to HAL 
+            VOS_STATUS_E_FAILURE  Config not passed to HAL.
+            VOS_STATUS_SUCCESS  Config passed to HAL
   ---------------------------------------------------------------------------*/
 VOS_STATUS sme_BtcSetConfig (tHalHandle hHal, tpSmeBtcConfig pSmeBtcConfig);
 
@@ -1727,8 +1727,8 @@ VOS_STATUS sme_BtcGetConfig (tHalHandle hHal, tpSmeBtcConfig pSmeBtcConfig);
     \brief  API to set configure privacy parameters
     \param  hHal - The handle returned by macOpen.
     \param  pProfile - Pointer CSR Roam profile.
-    \param  fPrivacy - This parameter indicates status of privacy 
-                            
+    \param  fPrivacy - This parameter indicates status of privacy
+
     \return void
   ---------------------------------------------------------------------------*/
 void sme_SetCfgPrivacy(tHalHandle hHal, tCsrRoamProfile *pProfile, tANI_BOOLEAN fPrivacy);
@@ -1745,7 +1745,7 @@ void sme_SetCfgPrivacy(tHalHandle hHal, tCsrRoamProfile *pProfile, tANI_BOOLEAN
             VOS_STATUS_E_FAILURE - failure
             VOS_STATUS_SUCCESS  success
   ---------------------------------------------------------------------------*/
-VOS_STATUS sme_NeighborReportRequest (tHalHandle hHal, tANI_U8 sessionId, 
+VOS_STATUS sme_NeighborReportRequest (tHalHandle hHal, tANI_U8 sessionId,
                 tpRrmNeighborReq pRrmNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo);
 #endif
 
@@ -1787,14 +1787,14 @@ eHalStatus sme_RoamRegisterCallback(tHalHandle hHal,
 #ifdef FEATURE_WLAN_WAPI
 /* ---------------------------------------------------------------------------
     \fn sme_RoamSetBKIDCache
-    \brief The SME API exposed to HDD to allow HDD to provde SME the BKID 
+    \brief The SME API exposed to HDD to allow HDD to provde SME the BKID
     candidate list.
-    \param hHal - Handle to the HAL. The HAL handle is returned by the HAL after 
+    \param hHal - Handle to the HAL. The HAL handle is returned by the HAL after
     it is opened (by calling halOpen).
     \param pBKIDCache - caller allocated buffer point to an array of tBkidCacheInfo
-    \param numItems - a variable that has the number of tBkidCacheInfo allocated 
+    \param numItems - a variable that has the number of tBkidCacheInfo allocated
     when retruning, this is the number of items put into pBKIDCache
-    \return eHalStatus - when fail, it usually means the buffer allocated is not 
+    \return eHalStatus - when fail, it usually means the buffer allocated is not
     big enough and pNumItems has the number of tBkidCacheInfo.
   ---------------------------------------------------------------------------*/
 eHalStatus sme_RoamSetBKIDCache( tHalHandle hHal, tANI_U32 sessionId, tBkidCacheInfo *pBKIDCache,
@@ -1802,16 +1802,16 @@ eHalStatus sme_RoamSetBKIDCache( tHalHandle hHal, tANI_U32 sessionId, tBkidCache
 
 /* ---------------------------------------------------------------------------
     \fn sme_RoamGetBKIDCache
-    \brief The SME API exposed to HDD to allow HDD to request SME to return its 
+    \brief The SME API exposed to HDD to allow HDD to request SME to return its
     BKID cache.
-    \param hHal - Handle to the HAL. The HAL handle is returned by the HAL after 
+    \param hHal - Handle to the HAL. The HAL handle is returned by the HAL after
     it is opened (by calling halOpen).
-    \param pNum - caller allocated memory that has the space of the number of 
-    tBkidCacheInfo as input. Upon returned, *pNum has the needed number of entries 
+    \param pNum - caller allocated memory that has the space of the number of
+    tBkidCacheInfo as input. Upon returned, *pNum has the needed number of entries
     in SME cache.
-    \param pBkidCache - Caller allocated memory that contains BKID cache, if any, 
+    \param pBkidCache - Caller allocated memory that contains BKID cache, if any,
     upon return
-    \return eHalStatus - when fail, it usually means the buffer allocated is not 
+    \return eHalStatus - when fail, it usually means the buffer allocated is not
     big enough.
   ---------------------------------------------------------------------------*/
 eHalStatus sme_RoamGetBKIDCache(tHalHandle hHal, tANI_U32 *pNum,
@@ -1819,9 +1819,9 @@ eHalStatus sme_RoamGetBKIDCache(tHalHandle hHal, tANI_U32 *pNum,
 
 /* ---------------------------------------------------------------------------
     \fn sme_RoamGetNumBKIDCache
-    \brief The SME API exposed to HDD to allow HDD to request SME to return the 
+    \brief The SME API exposed to HDD to allow HDD to request SME to return the
     number of BKID cache entries.
-    \param hHal - Handle to the HAL. The HAL handle is returned by the HAL after 
+    \param hHal - Handle to the HAL. The HAL handle is returned by the HAL after
     it is opened (by calling halOpen).
     \return tANI_U32 - the number of BKID cache entries.
   ---------------------------------------------------------------------------*/
@@ -1830,20 +1830,20 @@ tANI_U32 sme_RoamGetNumBKIDCache(tHalHandle hHal, tANI_U32 sessionId);
 /* ---------------------------------------------------------------------------
     \fn sme_ScanGetBKIDCandidateList
     \brief a wrapper function to return the BKID candidate list
-    \param pBkidList - caller allocated buffer point to an array of 
+    \param pBkidList - caller allocated buffer point to an array of
                         tBkidCandidateInfo
-    \param pNumItems - pointer to a variable that has the number of 
-                       tBkidCandidateInfo allocated when retruning, this is 
-                       either the number needed or number of items put into 
+    \param pNumItems - pointer to a variable that has the number of
+                       tBkidCandidateInfo allocated when retruning, this is
+                       either the number needed or number of items put into
                        pPmkidList
-    \return eHalStatus - when fail, it usually means the buffer allocated is not 
+    \return eHalStatus - when fail, it usually means the buffer allocated is not
                          big enough and pNumItems
     has the number of tBkidCandidateInfo.
-    \Note: pNumItems is a number of tBkidCandidateInfo, 
+    \Note: pNumItems is a number of tBkidCandidateInfo,
            not sizeof(tBkidCandidateInfo) * something
   ---------------------------------------------------------------------------*/
 eHalStatus sme_ScanGetBKIDCandidateList(tHalHandle hHal, tANI_U32 sessionId,
-                                        tBkidCandidateInfo *pBkidList, 
+                                        tBkidCandidateInfo *pBkidList,
                                         tANI_U32 *pNumItems );
 #endif /* FEATURE_WLAN_WAPI */
 
@@ -1857,22 +1857,22 @@ eHalStatus sme_ScanGetBKIDCandidateList(tHalHandle hHal, tANI_U32 sessionId,
     \param pOemDataReqID - pointer to an object to get back the request ID
     \param callback - a callback function that is called upon finish
     \param pContext - a pointer passed in for the callback
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_OemDataReq(tHalHandle hHal, 
+eHalStatus sme_OemDataReq(tHalHandle hHal,
                                        tANI_U8 sessionId,
-                                       tOemDataReqConfig *, 
-                                       tANI_U32 *pOemDataReqID, 
-                                       oemData_OemDataReqCompleteCallback callback, 
+                                       tOemDataReqConfig *,
+                                       tANI_U32 *pOemDataReqID,
+                                       oemData_OemDataReqCompleteCallback callback,
                                        void *pContext);
 
 /* ---------------------------------------------------------------------------
     \fn sme_getOemDataRsp
     \param pOemDataRsp - A pointer to the response object
     \param pOemDataReqID - pointer to an object to get back the request ID
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_getOemDataRsp(tHalHandle hHal, 
+eHalStatus sme_getOemDataRsp(tHalHandle hHal,
                                          tOemDataRsp **pOemDataRsp);
 
 #endif /*FEATURE_OEM_DATA_SUPPORT*/
@@ -1904,7 +1904,7 @@ eHalStatus sme_RoamUpdateAPWPSIE(tHalHandle, tANI_U8 sessionId, tSirAPWPSIEs *pA
 
     \param pAPSirRSNie - pointer to a caller allocated object of tSirRSNie with WPS/RSN IEs
 
-    \return eHalStatus  SUCCESS  
+    \return eHalStatus  SUCCESS
 
                          FAILURE or RESOURCES  The API finished and failed.
 
@@ -1915,10 +1915,10 @@ eHalStatus sme_RoamUpdateAPWPARSNIEs(tHalHandle hHal, tANI_U8 sessionId, tSirRSN
 
     sme_ChangeMCCBeaconInterval
 
-    \brief To update P2P-GO's beacon Interval. 
+    \brief To update P2P-GO's beacon Interval.
 
-    \return eHalStatus  SUCCESS 
-                        FAILURE or RESOURCES 
+    \return eHalStatus  SUCCESS
+                        FAILURE or RESOURCES
                         The API finished and failed.
   -------------------------------------------------------------------------------*/
 eHalStatus sme_ChangeMCCBeaconInterval(tHalHandle hHal, tANI_U8 sessionId);
@@ -1930,7 +1930,7 @@ eHalStatus sme_ChangeMCCBeaconInterval(tHalHandle hHal, tANI_U8 sessionId);
   \brief API to send the btAMPstate to FW
   \param  hHal - The handle returned by macOpen.
   \param  btAmpEvent -- btAMP event
-  \return eHalStatus  SUCCESS 
+  \return eHalStatus  SUCCESS
                          FAILURE or RESOURCES  The API finished and failed.
 
 --------------------------------------------------------------------------- */
@@ -1963,7 +1963,7 @@ eHalStatus sme_SetKeepAlive (tHalHandle hHal, tANI_U8 sessionId,
    \fn sme_GetOperationChannel
    \brief API to get current channel on which STA is parked
    this function gives channel information only of infra station or IBSS station.
-   \param hHal, pointer to memory location and sessionId 
+   \param hHal, pointer to memory location and sessionId
    \returns eHAL_STATUS_SUCCESS
             eHAL_STATUS_FAILURE
 -------------------------------------------------------------------------------*/
@@ -1973,42 +1973,42 @@ eHalStatus sme_GetOperationChannel(tHalHandle hHal, tANI_U32 *pChannel, tANI_U8
 
     \fn sme_RegisterMgtFrame
 
-    \brief To register managment frame of specified type and subtype. 
+    \brief To register managment frame of specified type and subtype.
     \param frameType - type of the frame that needs to be passed to HDD.
-    \param matchData - data which needs to be matched before passing frame 
-                       to HDD. 
+    \param matchData - data which needs to be matched before passing frame
+                       to HDD.
     \param matchDataLen - Length of matched data.
-    \return eHalStatus 
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
-eHalStatus sme_RegisterMgmtFrame(tHalHandle hHal, tANI_U8 sessionId, 
+eHalStatus sme_RegisterMgmtFrame(tHalHandle hHal, tANI_U8 sessionId,
                      tANI_U16 frameType, tANI_U8* matchData, tANI_U16 matchLen);
 
 /* ---------------------------------------------------------------------------
 
     \fn sme_DeregisterMgtFrame
 
-    \brief To De-register managment frame of specified type and subtype. 
+    \brief To De-register managment frame of specified type and subtype.
     \param frameType - type of the frame that needs to be passed to HDD.
-    \param matchData - data which needs to be matched before passing frame 
-                       to HDD. 
+    \param matchData - data which needs to be matched before passing frame
+                       to HDD.
     \param matchDataLen - Length of matched data.
-    \return eHalStatus 
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
-eHalStatus sme_DeregisterMgmtFrame(tHalHandle hHal, tANI_U8 sessionId, 
+eHalStatus sme_DeregisterMgmtFrame(tHalHandle hHal, tANI_U8 sessionId,
                      tANI_U16 frameType, tANI_U8* matchData, tANI_U16 matchLen);
 
 /* ---------------------------------------------------------------------------
 
   \fn    sme_ConfigureRxpFilter
 
-  \brief 
+  \brief
     SME will pass this request to lower mac to set/reset the filter on RXP for
     multicast & broadcast traffic.
 
-  \param 
+  \param
+
+    hHal - The handle returned by macOpen.
 
-    hHal - The handle returned by macOpen. 
- 
     filterMask- Currently the API takes a 1 or 0 (set or reset) as filter.
     Basically to enable/disable the filter (to filter "all" mcbc traffic) based
     on this param. In future we can use this as a mask to set various types of
@@ -2017,33 +2017,33 @@ eHalStatus sme_DeregisterMgmtFrame(tHalHandle hHal, tANI_U8 sessionId,
     FILTER_ALL_BROADCAST:
     FILTER_ALL_MULTICAST_BROADCAST:
 
-   
-  \return eHalStatus    
-  
-  
+
+  \return eHalStatus
+
+
 --------------------------------------------------------------------------- */
-eHalStatus sme_ConfigureRxpFilter( tHalHandle hHal, 
+eHalStatus sme_ConfigureRxpFilter( tHalHandle hHal,
                               tpSirWlanSetRxpFilters  wlanRxpFilterParam);
 
 /* ---------------------------------------------------------------------------
 
   \fn    sme_ConfigureAppsCpuWakeupState
 
-  \brief 
+  \brief
     SME will pass this request to lower mac to dynamically adjusts the listen
     interval based on the WLAN/MSM activity. This feature is named as
     Telescopic Beacon wakeup feature.
 
-  \param 
+  \param
+
+    hHal - The handle returned by macOpen.
 
-    hHal - The handle returned by macOpen. 
- 
     isAppsAwake- Depicts the state of the Apps CPU
 
-   
-  \return eHalStatus    
-  
-  
+
+  \return eHalStatus
+
+
 --------------------------------------------------------------------------- */
 eHalStatus sme_ConfigureAppsCpuWakeupState( tHalHandle hHal, tANI_BOOLEAN  isAppsAwake);
 
@@ -2051,25 +2051,25 @@ eHalStatus sme_ConfigureAppsCpuWakeupState( tHalHandle hHal, tANI_BOOLEAN  isApp
 
   \fn    sme_ConfigureSuspendInd
 
-  \brief 
-    SME will pass this request to lower mac to Indicate that the wlan needs to 
+  \brief
+    SME will pass this request to lower mac to Indicate that the wlan needs to
     be suspended
 
-  \param 
+  \param
+
+    hHal - The handle returned by macOpen.
 
-    hHal - The handle returned by macOpen. 
- 
     wlanSuspendParam- Depicts the wlan suspend params
 
     csrReadyToSuspendCallback - Callback to be called when ready to suspend
                                 event is received.
     callbackContext  - Context associated with csrReadyToSuspendCallback.
-   
-  \return eHalStatus    
-  
-  
+
+  \return eHalStatus
+
+
 --------------------------------------------------------------------------- */
-eHalStatus sme_ConfigureSuspendInd( tHalHandle hHal, 
+eHalStatus sme_ConfigureSuspendInd( tHalHandle hHal,
                              tpSirWlanSuspendParam  wlanSuspendParam,
                              csrReadyToSuspendCallback,
                              void *callbackContext);
@@ -2078,22 +2078,22 @@ eHalStatus sme_ConfigureSuspendInd( tHalHandle hHal,
 
   \fn    sme_ConfigureResumeReq
 
-  \brief 
-    SME will pass this request to lower mac to Indicate that the wlan needs to 
+  \brief
+    SME will pass this request to lower mac to Indicate that the wlan needs to
     be Resumed
 
-  \param 
+  \param
+
+    hHal - The handle returned by macOpen.
 
-    hHal - The handle returned by macOpen. 
- 
     wlanResumeParam- Depicts the wlan resume params
 
-   
-  \return eHalStatus    
-  
-  
+
+  \return eHalStatus
+
+
 --------------------------------------------------------------------------- */
-eHalStatus sme_ConfigureResumeReq( tHalHandle hHal, 
+eHalStatus sme_ConfigureResumeReq( tHalHandle hHal,
                              tpSirWlanResumeParam  wlanResumeParam);
 
 
@@ -2186,12 +2186,12 @@ eHalStatus sme_SetRSSIFilter(tHalHandle hHal, v_U8_t rssiThreshold);
 * Name: sme_PreferredNetworkFoundInd
 *
 * Description:
-*    Invoke Preferred Network Found Indication 
+*    Invoke Preferred Network Found Indication
 *
 * Parameters:
 *    hHal - HAL handle for device
 *    pMsg - found network description
-* 
+*
 * Returns: eHalStatus
 *
 ******************************************************************************/
@@ -2200,7 +2200,7 @@ eHalStatus sme_PreferredNetworkFoundInd (tHalHandle hHal, void* pMsg);
 
 /* ---------------------------------------------------------------------------
     \fn sme_SetPowerParams
-    \brief  API to set Power Parameters 
+    \brief  API to set Power Parameters
     \param  hHal - The handle returned by macOpen.
     \param  pwParams -  Pointer to the power parameters requested.
     \param  forced - if true, not to be dropped silently in host, it must reach
@@ -2215,7 +2215,7 @@ eHalStatus sme_SetPowerParams(tHalHandle hHal, tSirSetPowerParamsReq* pwParams,
     \brief  Set Tx PER tracking configuration parameters
     \param  hHal - The handle returned by macOpen.
     \param  pTxPerTrackingParam - Tx PER configuration parameters
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_SetTxPerTracking (
    tHalHandle hHal,
@@ -2229,7 +2229,7 @@ eHalStatus sme_SetTxPerTracking (
     \brief  API to set 8023 Multicast Address List
     \param  hHal - The handle returned by macOpen.
     \param  pMulticastAddrs - Pointer to the Multicast Address List
-    \return eHalStatus   
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_8023MulticastList(tHalHandle hHal, tANI_U8 sessionId, tpSirRcvFltMcAddrList pMulticastAddrs);
 
@@ -2238,7 +2238,7 @@ eHalStatus sme_8023MulticastList(tHalHandle hHal, tANI_U8 sessionId, tpSirRcvFlt
     \brief  API to set Receive Packet Filter
     \param  hHal - The handle returned by macOpen.
     \param  pRcvPktFilterCfg - Receive Packet Filter parameter
-    \return eHalStatus   
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_ReceiveFilterSetFilter(tHalHandle hHal, tpSirRcvPktFilterCfgType pRcvPktFilterCfg,
                                            tANI_U8 sessionId);
@@ -2246,13 +2246,13 @@ eHalStatus sme_ReceiveFilterSetFilter(tHalHandle hHal, tpSirRcvPktFilterCfgType
 /* ---------------------------------------------------------------------------
     \fn sme_GetFilterMatchCount
     \brief  API to get D0 PC Filter Match Count
-    \param  hHal - The handle returned by macOpen 
+    \param  hHal - The handle returned by macOpen
     \param  callbackRoutine - Callback routine invoked to receive Packet Coalescing Filter Match Count
-    \param  callbackContext - Cookie to be passed back during callback 
-    \return eHalStatus   
+    \param  callbackContext - Cookie to be passed back during callback
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_GetFilterMatchCount(tHalHandle hHal, 
-                                   FilterMatchCountCallback callbackRoutine, 
+eHalStatus sme_GetFilterMatchCount(tHalHandle hHal,
+                                   FilterMatchCountCallback callbackRoutine,
                                    void *callbackContext,
                                    tANI_U8 sessionId);
 
@@ -2261,7 +2261,7 @@ eHalStatus sme_GetFilterMatchCount(tHalHandle hHal,
     \brief  API to clear Receive Packet Filter
     \param  hHal - The handle returned by macOpen.
     \param  pRcvFltPktClearParam - Receive Packet Filter Clear parameter
-    \return eHalStatus   
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_ReceiveFilterClearFilter(tHalHandle hHal,
                                         tpSirRcvFltPktClearParam pRcvFltPktClearParam,
@@ -2305,7 +2305,7 @@ eHalStatus sme_GetFreqBand(tHalHandle hHal, eCsrBand *pBand);
     \brief  Set Tx PER tracking configuration parameters
     \param  hHal - The handle returned by macOpen.
     \param  pTxPerTrackingParam - Tx PER configuration parameters
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_SetTxPerTracking (
    tHalHandle hHal,
@@ -2330,7 +2330,7 @@ eHalStatus sme_SetGTKOffload (tHalHandle hHal, tpSirGtkOffloadParams pRequest, t
     \param  pRequest -  Pointer to the GTK offload response.
     \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_GetGTKOffload (tHalHandle hHal, GTKOffloadGetInfoCallback callbackRoutine, 
+eHalStatus sme_GetGTKOffload (tHalHandle hHal, GTKOffloadGetInfoCallback callbackRoutine,
                                     void *callbackContext, tANI_U8 sessionId);
 #endif // WLAN_FEATURE_GTK_OFFLOAD
 
@@ -2343,7 +2343,7 @@ eHalStatus sme_WakeReasonIndCallback (tHalHandle hHal, void* pMsg);
     \brief  Set Tx PER tracking configuration parameters
     \param  hHal - The handle returned by macOpen.
     \param  pTxPerTrackingParam - Tx PER configuration parameters
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_SetTxPerTracking (
    tHalHandle hHal,
@@ -2366,7 +2366,7 @@ eHalStatus sme_p2pResetSession(tHalHandle hHal, tANI_U8 HDDSessionId);
     \brief  Remove cached P2P result from scan results
     \param  hHal - The handle returned by macOpen.
     \param  HDDSessionId - HDD's sessionId. Currently unused.
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus sme_p2pFlushDeviceList(tHalHandle hHal, tANI_U8 HDDSessionId);
 
@@ -2384,7 +2384,7 @@ eHalStatus sme_p2pGetResultFilter(tHalHandle hHal, tANI_U8 HDDSessionId,
     \param pBssid  power to set in dB
     \- return eHalStatus
     -------------------------------------------------------------------------*/
-eHalStatus sme_SetMaxTxPower(tHalHandle hHal, tSirMacAddr pBssid, 
+eHalStatus sme_SetMaxTxPower(tHalHandle hHal, tSirMacAddr pBssid,
                              tSirMacAddr pSelfMacAddress, v_S7_t dB);
 
 /* ---------------------------------------------------------------------------
@@ -2419,7 +2419,7 @@ eHalStatus sme_SetTxPower(tHalHandle hHal, v_U8_t sessionId,
     not persist over reboots.
 
     \param hHal
-    \param sessionId 
+    \param sessionId
     \param ssidHidden 0 - Broadcast SSID, 1 - Disable broadcast SSID
     \- return eHalStatus
 
@@ -2463,7 +2463,7 @@ void sme_disableFeatureCapablity(tANI_U8 feature_index);
 
 /*---------------------------------------------------------------------------
 
-  \brief sme_GetDefaultCountryCodeFrmNv() - SME interface to get the default 
+  \brief sme_GetDefaultCountryCodeFrmNv() - SME interface to get the default
          country code
   Host and FW.
 
@@ -2514,7 +2514,7 @@ void sme_ResetPowerValuesFor5G (tHalHandle hHal);
     \fn sme_UpdateRoamPrefer5GHz
     \brief  enable/disable Roam prefer 5G runtime option
             This function is called through dynamic setConfig callback function
-            to configure the Roam prefer 5G runtime option 
+            to configure the Roam prefer 5G runtime option
     \param  hHal - HAL handle for device
     \param  nRoamPrefer5GHz Enable/Disable Roam prefer 5G runtime option
     \- return Success or failure
@@ -2587,7 +2587,7 @@ v_U16_t sme_getRoamScanHomeAwayTime(tHalHandle hHal);
             to configure nImmediateRoamRssiDiff
             Usage: adb shell iwpriv wlan0 setConfig gImmediateRoamRssiDiff=[0 .. 125]
     \param  hHal - HAL handle for device
-    \param  nImmediateRoamRssiDiff - minimum rssi difference between potential 
+    \param  nImmediateRoamRssiDiff - minimum rssi difference between potential
             candidate and current AP.
     \- return Success or failure
     -------------------------------------------------------------------------*/
@@ -3037,11 +3037,11 @@ eHalStatus sme_UpdateRoamScanOffloadEnabled(tHalHandle hHal, v_BOOL_t nRoamScanO
 /* ---------------------------------------------------------------------------
     \fn sme_IsFeatureSupportedByFW
     \brief  Check if an feature is enabled by FW
-            
+
     \param  feattEnumValue - Enumeration value of the feature to be checked.
                 A value from enum placeHolderInCapBitmap
-                              
-    \- return 1/0 (TRUE/FALSE) 
+
+    \- return 1/0 (TRUE/FALSE)
     -------------------------------------------------------------------------*/
 tANI_U8 sme_IsFeatureSupportedByFW(tANI_U8 featEnumValue);
 #ifdef FEATURE_WLAN_TDLS
@@ -3063,7 +3063,7 @@ VOS_STATUS sme_SendTdlsLinkEstablishParams(tHalHandle hHal,
 /* ---------------------------------------------------------------------------
     \fn sme_SendTdlsMgmtFrame
     \brief  API to send TDLS management frames.
-            
+
     \param  peerMac - peer's Mac Adress.
     \param frame_type - Type of TDLS mgmt frame to be sent.
     \param dialog - dialog token used in the frame.
@@ -3088,7 +3088,7 @@ VOS_STATUS sme_ChangeTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr
 /* ---------------------------------------------------------------------------
     \fn sme_AddTdlsPeerSta
     \brief  API to Add TDLS peer sta entry.
-            
+
     \param  peerMac - peer's Mac Adress.
     \- return VOS_STATUS_SUCCES
     -------------------------------------------------------------------------*/
@@ -3096,7 +3096,7 @@ VOS_STATUS sme_AddTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr pe
 /* ---------------------------------------------------------------------------
     \fn sme_DeleteTdlsPeerSta
     \brief  API to Delete TDLS peer sta entry.
-            
+
     \param  peerMac - peer's Mac Adress.
     \- return VOS_STATUS_SUCCES
     -------------------------------------------------------------------------*/
diff --git a/CORE/SME/inc/sme_FTApi.h b/CORE/SME/inc/sme_FTApi.h
index 2704ca474f08..0b58aced58c2 100644
--- a/CORE/SME/inc/sme_FTApi.h
+++ b/CORE/SME/inc/sme_FTApi.h
@@ -32,9 +32,9 @@
 #include <palTimer.h>
 
 /**=========================================================================
-  
+
   \brief macros and prototype for SME APIs
-  
+
   ========================================================================*/
 typedef enum eFTIEState
 {
@@ -44,7 +44,7 @@ typedef enum eFTIEState
     eFT_AUTH_COMPLETE,              // We are now ready for FT phase, send auth1, recd auth2
     eFT_REASSOC_REQ_WAIT,           // Now we have sent Auth Rsp to the supplicant and waiting
                                     // Reassoc Req from the supplicant.
-    eFT_SET_KEY_WAIT,               // We have received the Reassoc request from 
+    eFT_SET_KEY_WAIT,               // We have received the Reassoc request from
                                     // supplicant. Waiting for the keys.
 } tFTIEStates;
 
diff --git a/CORE/SME/inc/sme_QosApi.h b/CORE/SME/inc/sme_QosApi.h
index 26df1d6f5d92..05b623387fea 100644
--- a/CORE/SME/inc/sme_QosApi.h
+++ b/CORE/SME/inc/sme_QosApi.h
@@ -31,11 +31,11 @@
 
 
 /**=========================================================================
-  
+
   \file  sme_QosApi.h
-  
+
   \brief prototype for SME QoS APIs
-  
+
   ========================================================================*/
 
 /* $Header$ */
@@ -58,7 +58,7 @@
 #define SME_QOS_UAPSD_BE      0x08
 #define SME_QOS_UAPSD_BK      0x04
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Type declarations
   ------------------------------------------------------------------------*/
 
@@ -69,33 +69,33 @@ typedef enum
 {
    //async: once PE notifies successful TSPEC negotiation, or CSR notifies for
    //successful reassoc, notifies HDD with current QoS Params
-   SME_QOS_STATUS_SETUP_SUCCESS_IND = 0, 
+   SME_QOS_STATUS_SETUP_SUCCESS_IND = 0,
    //sync: only when App asked for APSD & it's already set with ACM = 0
    SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY,
    //both: sync or async: in case of async notifies HDD with current QoS Params
-   SME_QOS_STATUS_SETUP_FAILURE_RSP, 
+   SME_QOS_STATUS_SETUP_FAILURE_RSP,
    //sync
-   SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP, 
+   SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP,
    //sync: AP doesn't support QoS (WMM)
-   SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP, 
+   SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP,
    //sync: either req has been sent down to PE or just buffered in SME
-   SME_QOS_STATUS_SETUP_REQ_PENDING_RSP, 
-   //async: in case of flow aggregation, if the new TSPEC negotiation is 
-   //successful, OR, 
+   SME_QOS_STATUS_SETUP_REQ_PENDING_RSP,
+   //async: in case of flow aggregation, if the new TSPEC negotiation is
+   //successful, OR,
    //notify existing flows that TSPEC is modified with current QoS Params
    SME_QOS_STATUS_SETUP_MODIFIED_IND,
    //sync: no APSD asked for & ACM = 0
-   SME_QOS_STATUS_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP, 
-   //async: In case of UAPSD, once PE notifies successful TSPEC negotiation, or 
+   SME_QOS_STATUS_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP,
+   //async: In case of UAPSD, once PE notifies successful TSPEC negotiation, or
    //CSR notifies for successful reassoc to SME-QoS, notify HDD if PMC can't
    //put the module in UAPSD mode right away (eHAL_STATUS_PMC_PENDING)
-   SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_PENDING, 
-   //async: In case of UAPSD, once PE notifies successful TSPEC negotiation, or 
+   SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_PENDING,
+   //async: In case of UAPSD, once PE notifies successful TSPEC negotiation, or
    //CSR notifies for successful reassoc to SME-QoS, notify HDD if PMC can't
    //put the module in UAPSD mode at all (eHAL_STATUS_FAILURE)
-   SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED, 
+   SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED,
 
-   //sync: req has been sent down to PE in case of delts or addts for remain 
+   //sync: req has been sent down to PE in case of delts or addts for remain
    // flows, OR if the AC doesn't have APSD or ACM
    //async: once the downgrade req for QoS params is successful
    SME_QOS_STATUS_RELEASE_SUCCESS_RSP = 100,
@@ -103,13 +103,13 @@ typedef enum
    SME_QOS_STATUS_RELEASE_FAILURE_RSP,
    //async: AP sent DELTS indication
    SME_QOS_STATUS_RELEASE_QOS_LOST_IND,
-   //sync: an addts req has been sent down to PE to downgrade the QoS params or 
+   //sync: an addts req has been sent down to PE to downgrade the QoS params or
    // just buffered in SME
-   SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP, 
+   SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP,
    //sync
-   SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP, 
+   SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP,
 
-   //async: for QoS modify request if modification is successful, notifies HDD 
+   //async: for QoS modify request if modification is successful, notifies HDD
    // with current QoS Params
    SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND = 200,
    //sync: only when App asked for APSD & it's already set with ACM = 0
@@ -119,14 +119,14 @@ typedef enum
    //sync: either req has been sent down to PE or just buffered in SME
    SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP,
    //sync: no APSD asked for & ACM = 0
-   SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP, 
+   SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP,
    //sync
-   SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP, 
-   //async: In case of UAPSD, once PE notifies successful TSPEC negotiation, or 
+   SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP,
+   //async: In case of UAPSD, once PE notifies successful TSPEC negotiation, or
    //CSR notifies for successful reassoc to SME-QoS, notify HDD if PMC can't
    //put the module in UAPSD mode right away (eHAL_STATUS_PMC_PENDING)
-   SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_PENDING, 
-   //async: In case of UAPSD, once PE notifies successful TSPEC negotiation, or 
+   SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_PENDING,
+   //async: In case of UAPSD, once PE notifies successful TSPEC negotiation, or
    //CSR notifies for successful reassoc to SME-QoS, notify HDD if PMC can't
    //put the module in UAPSD mode at all (eHAL_STATUS_FAILURE)
    SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED,
@@ -136,12 +136,12 @@ typedef enum
    SME_QOS_STATUS_OUT_OF_APSD_POWER_MODE_IND = 400,
    //async:powersave mode changed by PMC from Full power to UAPSD
    SME_QOS_STATUS_INTO_APSD_POWER_MODE_IND,
-   
+
 }sme_QosStatusType;
 
 /*---------------------------------------------------------------------------
    Enumeration of the various User priority (UP) types
-   
+
    From 802.1D/802.11e/WMM specifications (all refer to same table)
 ---------------------------------------------------------------------------*/
 typedef enum
@@ -161,7 +161,7 @@ typedef enum
 
 /*---------------------------------------------------------------------------
    Enumeration of the various TSPEC directions
-   
+
    From 802.11e/WMM specifications
 ---------------------------------------------------------------------------*/
 
@@ -176,7 +176,7 @@ typedef enum
 
 /*---------------------------------------------------------------------------
    Enumeration of the various TSPEC ack policies.
-   
+
    From 802.11 WMM specification
 ---------------------------------------------------------------------------*/
 
@@ -191,7 +191,7 @@ typedef enum
 
 /*---------------------------------------------------------------------------
    TS Info field in the WMM TSPEC
-   
+
    See suggestive values above
 ---------------------------------------------------------------------------*/
 typedef struct
@@ -208,7 +208,7 @@ typedef struct
     The WMM TSPEC Element (from the WMM spec)
 ---------------------------------------------------------------------------*/
 typedef struct
-{ 
+{
   sme_QosWmmTsInfoType            ts_info;
   v_U16_t                         nominal_msdu_size;
   v_U16_t                         maximum_msdu_size;
@@ -228,69 +228,69 @@ typedef struct
 } sme_QosWmmTspecInfo;
 
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
                          External APIs
   ------------------------------------------------------------------------*/
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosCallback() - This is a callback function which is registered 
-   per flow while HDD is requesting for QoS. Used for any notification for the 
+  \brief sme_QosCallback() - This is a callback function which is registered
+   per flow while HDD is requesting for QoS. Used for any notification for the
    flow (i.e. setup success/failure/release) which needs to be sent to HDD. HDD
    will notify the application in turn, if needed.
-  
+
   \param hHal - The handle returned by macOpen.
-  \param HDDcontext - A cookie passed by HDD during QoS setup, to be used by SME 
-                      during any QoS notification (through the callabck) to HDD 
-  \param pCurrentQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM 
+  \param HDDcontext - A cookie passed by HDD during QoS setup, to be used by SME
+                      during any QoS notification (through the callabck) to HDD
+  \param pCurrentQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM
                            TSPEC related info as defined above, fed back to HDD
-  \param status - The status of the flow running on an AC. It could be of 
+  \param status - The status of the flow running on an AC. It could be of
                   sme_QosStatusType
-  
+
   \return eHAL_STATUS_SUCCESS - Callback invoke successful.
-  
+
 
   \sa
-  
+
   --------------------------------------------------------------------------*/
-typedef eHalStatus (*sme_QosCallback)(tHalHandle hHal, void * HDDcontext, 
-                                      sme_QosWmmTspecInfo * pCurrentQoSInfo, 
+typedef eHalStatus (*sme_QosCallback)(tHalHandle hHal, void * HDDcontext,
+                                      sme_QosWmmTspecInfo * pCurrentQoSInfo,
                                       sme_QosStatusType status,
-                                      v_U32_t QosFlowID);   
+                                      v_U32_t QosFlowID);
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosSetupReq() - The SME QoS API exposed to HDD to request for QoS 
-  on a particular AC. This function should be called after a link has been 
-  established, i.e. STA is associated with an AP etc. If the request involves 
-  admission control on the requested AC, HDD needs to provide the necessary 
+  \brief sme_QosSetupReq() - The SME QoS API exposed to HDD to request for QoS
+  on a particular AC. This function should be called after a link has been
+  established, i.e. STA is associated with an AP etc. If the request involves
+  admission control on the requested AC, HDD needs to provide the necessary
   Traffic Specification (TSPEC) parameters otherwise SME is going to use the
   default params.
-  
+
   \param hHal - The handle returned by macOpen.
-  \param sessionId - sessionId returned by sme_OpenSession. Current QOS code doesn't 
+  \param sessionId - sessionId returned by sme_OpenSession. Current QOS code doesn't
                      support multiple session. This function returns failure when different
                      sessionId is passed in before calling sme_QosReleaseReq.
   \param pQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM TSPEC
                     related info as defined above, provided by HDD
-  \param QoSCallback - The callback which is registered per flow while 
-                       requesting for QoS. Used for any notification for the 
-                       flow (i.e. setup success/failure/release) which needs to 
+  \param QoSCallback - The callback which is registered per flow while
+                       requesting for QoS. Used for any notification for the
+                       flow (i.e. setup success/failure/release) which needs to
                        be sent to HDD
-  \param HDDcontext - A cookie passed by HDD to be used by SME during any QoS 
-                      notification (through the callabck) to HDD 
+  \param HDDcontext - A cookie passed by HDD to be used by SME during any QoS
+                      notification (through the callabck) to HDD
   \param UPType - Useful only if HDD or any other upper layer module (BAP etc.)
-                  looking for implicit QoS setup, in that 
+                  looking for implicit QoS setup, in that
                   case, the pQoSInfo will be NULL & SME will know about the AC
                   (from the UP provided in this param) QoS is requested on
-  \param pQosFlowID - Identification per flow running on each AC generated by 
-                      SME. 
-                     It is only meaningful if the QoS setup for the flow is 
+  \param pQosFlowID - Identification per flow running on each AC generated by
+                      SME.
+                     It is only meaningful if the QoS setup for the flow is
                      successful
-                  
+
   \return SME_QOS_STATUS_SETUP_SUCCESS - Setup request processed successfully.
-  
-          Other status means Setup request failed     
+
+          Other status means Setup request failed
   \sa
-  
+
   --------------------------------------------------------------------------*/
 sme_QosStatusType sme_QosSetupReq(tHalHandle hHal, tANI_U32 sessionId,
                                   sme_QosWmmTspecInfo * pQoSInfo,
@@ -298,66 +298,66 @@ sme_QosStatusType sme_QosSetupReq(tHalHandle hHal, tANI_U32 sessionId,
                                   sme_QosWmmUpType UPType, v_U32_t * pQosFlowID);
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosModifyReq() - The SME QoS API exposed to HDD to request for 
-  modification of certain QoS params on a flow running on a particular AC. 
-  This function should be called after a link has been established, i.e. STA is 
-  associated with an AP etc. & a QoS setup has been succesful for that flow. 
-  If the request involves admission control on the requested AC, HDD needs to 
+  \brief sme_QosModifyReq() - The SME QoS API exposed to HDD to request for
+  modification of certain QoS params on a flow running on a particular AC.
+  This function should be called after a link has been established, i.e. STA is
+  associated with an AP etc. & a QoS setup has been succesful for that flow.
+  If the request involves admission control on the requested AC, HDD needs to
   provide the necessary Traffic Specification (TSPEC) parameters & SME might
   start the renegotiation process through ADDTS.
-  
+
   \param hHal - The handle returned by macOpen.
   \param pQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM TSPEC
                     related info as defined above, provided by HDD
-  \param QosFlowID - Identification per flow running on each AC generated by 
-                      SME. 
-                     It is only meaningful if the QoS setup for the flow has 
+  \param QosFlowID - Identification per flow running on each AC generated by
+                      SME.
+                     It is only meaningful if the QoS setup for the flow has
                      been successful already
-                  
-  \return SME_QOS_STATUS_SETUP_SUCCESS - Modification request processed 
+
+  \return SME_QOS_STATUS_SETUP_SUCCESS - Modification request processed
                                          successfully.
-  
-          Other status means request failed     
+
+          Other status means request failed
   \sa
-  
+
   --------------------------------------------------------------------------*/
-sme_QosStatusType sme_QosModifyReq(tHalHandle hHal, 
+sme_QosStatusType sme_QosModifyReq(tHalHandle hHal,
                                    sme_QosWmmTspecInfo * pQoSInfo,
                                    v_U32_t QosFlowID);
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosReleaseReq() - The SME QoS API exposed to HDD to request for 
-  releasing a QoS flow running on a particular AC. This function should be 
-  called only if a QoS is set up with a valid FlowID. HDD sould invoke this 
-  API only if an explicit request for QoS release has come from Application 
-  
+  \brief sme_QosReleaseReq() - The SME QoS API exposed to HDD to request for
+  releasing a QoS flow running on a particular AC. This function should be
+  called only if a QoS is set up with a valid FlowID. HDD sould invoke this
+  API only if an explicit request for QoS release has come from Application
+
   \param hHal - The handle returned by macOpen.
-  \param QosFlowID - Identification per flow running on each AC generated by SME 
-                     It is only meaningful if the QoS setup for the flow is 
+  \param QosFlowID - Identification per flow running on each AC generated by SME
+                     It is only meaningful if the QoS setup for the flow is
                      successful
-  
-  \return SME_QOS_STATUS_RELEASE_SUCCESS - Release request processed 
+
+  \return SME_QOS_STATUS_RELEASE_SUCCESS - Release request processed
                                            successfully.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 sme_QosStatusType sme_QosReleaseReq(tHalHandle hHal, v_U32_t QosFlowID);
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosIsTSInfoAckPolicyValid() - The SME QoS API exposed to HDD to 
-  check if TS info ack policy field can be set to "HT-immediate block acknowledgement" 
-  
+  \brief sme_QosIsTSInfoAckPolicyValid() - The SME QoS API exposed to HDD to
+  check if TS info ack policy field can be set to "HT-immediate block acknowledgement"
+
   \param pMac - The handle returned by macOpen.
   \param pQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM TSPEC
                     related info, provided by HDD
   \param sessionId - sessionId returned by sme_OpenSession.
-  
+
   \return VOS_TRUE - Current Association is HT association and so TS info ack policy
                      can be set to "HT-immediate block acknowledgement"
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 v_BOOL_t sme_QosIsTSInfoAckPolicyValid(tpAniSirGlobal pMac,
     sme_QosWmmTspecInfo * pQoSInfo,
diff --git a/CORE/SME/inc/sme_RrmApi.h b/CORE/SME/inc/sme_RrmApi.h
index 9b20453d19bc..a4faac30a00c 100644
--- a/CORE/SME/inc/sme_RrmApi.h
+++ b/CORE/SME/inc/sme_RrmApi.h
@@ -31,11 +31,11 @@
 
 
 /**=========================================================================
-  
+
   \file  sme_RrmApi.h
-  
+
   \brief prototype for SME RRM APIs
-  
+
   ========================================================================*/
 
 /* $Header$ */
@@ -54,7 +54,7 @@
 
 
 //APIs
-eHalStatus sme_RrmMsgProcessor( tpAniSirGlobal pMac,  v_U16_t msg_type, 
+eHalStatus sme_RrmMsgProcessor( tpAniSirGlobal pMac,  v_U16_t msg_type,
                                 void *pMsgBuf);
 
 VOS_STATUS rrmClose (tpAniSirGlobal pMac);
diff --git a/CORE/SME/inc/smsDebug.h b/CORE/SME/inc/smsDebug.h
index 3ad35e1b798b..c773d92221d3 100644
--- a/CORE/SME/inc/smsDebug.h
+++ b/CORE/SME/inc/smsDebug.h
@@ -51,4 +51,3 @@ void __printf(3,4)
 pmcLog(tpAniSirGlobal pMac, tANI_U32 loglevel, const char *pString, ...);
 
 #endif // __SMS_DEBUG_H__
-
diff --git a/CORE/SME/inc/wlan_ps_wow_diag.h b/CORE/SME/inc/wlan_ps_wow_diag.h
index 5c3bc8544866..9fa1e0073688 100644
--- a/CORE/SME/inc/wlan_ps_wow_diag.h
+++ b/CORE/SME/inc/wlan_ps_wow_diag.h
@@ -31,7 +31,7 @@
 #include "vos_diag_core_event.h"
 #include "vos_diag_core_log.h"
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT 
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
 
 typedef enum
 {
@@ -66,12 +66,12 @@ typedef enum
    WLAN_FULL_PWR_NEEDED_BY_BAP,    /* BAP request full power for BT_AMP */
    WLAN_FULL_PWR_NEEDED_BY_CSR,    /* CSR requests full power */
    WLAN_FULL_PWR_NEEDED_BY_QOS,    /* QOS requests full power */
-   WLAN_REASON_OTHER               /* No specific reason. General reason code */ 
+   WLAN_REASON_OTHER               /* No specific reason. General reason code */
 
 } wlan_ps_full_power_request_reason_t;
 
 // maps directly to ePmcState
-typedef enum 
+typedef enum
 {
    WLAN_PMC_STOPPED, /* PMC is stopped */
    WLAN_PMC_FULL_POWER, /* full power */
@@ -142,4 +142,3 @@ typedef enum
 #endif // FEATURE_WLAN_DIAG_SUPPORT
 
 #endif // _WLAN_PS_WOW_DIAG_H_
-
diff --git a/CORE/SME/src/QoS/sme_Qos.c b/CORE/SME/src/QoS/sme_Qos.c
index 420faef8c3ca..cfb4d135e82a 100644
--- a/CORE/SME/src/QoS/sme_Qos.c
+++ b/CORE/SME/src/QoS/sme_Qos.c
@@ -26,11 +26,11 @@
  */
 
 /**=========================================================================
-  
+
   \file  sme_Qos.c
-  
+
   \brief implementation for SME QoS APIs
-  
+
   ========================================================================*/
 /* $Header$ */
 /*--------------------------------------------------------------------------
@@ -54,7 +54,7 @@
 
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
 /* TODO : 6Mbps as Cisco APs seem to like only this value; analysis req.   */
-#define SME_QOS_MIN_PHY_RATE         0x5B8D80    
+#define SME_QOS_MIN_PHY_RATE         0x5B8D80
 #define SME_QOS_SURPLUS_BW_ALLOWANCE  0x2000     /* Ratio of 1.0           */
 /*---------------------------------------------------------------------------
   Max values to bound tspec params against and avoid rollover
@@ -72,7 +72,7 @@
     (SME_QOS_32BIT_MAX) : (_x)+(_y);                                        \
   } while(0)
 /*---------------------------------------------------------------------------
-  As per WMM spec there could be max 2 TSPEC running on the same AC with 
+  As per WMM spec there could be max 2 TSPEC running on the same AC with
   different direction. We will refer each TSPEC with an index
 ---------------------------------------------------------------------------*/
 #define SME_QOS_TSPEC_INDEX_0            0
@@ -102,7 +102,7 @@
 // The Dialog Token field shall be set [...] to a non-zero value
 #define SME_QOS_MIN_DIALOG_TOKEN         1
 #define SME_QOS_MAX_DIALOG_TOKEN         0xFF
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Type declarations
   ------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------
@@ -116,7 +116,7 @@ typedef enum
    SME_QOS_REQUESTED,
    SME_QOS_QOS_ON,
    SME_QOS_HANDOFF,
-   
+
 }sme_QosStates;
 /*---------------------------------------------------------------------------
    Enumeration of the various Release QoS trigger
@@ -127,7 +127,7 @@ typedef enum
    SME_QOS_RELEASE_BY_AP,
 }sme_QosRelTriggers;
 /*---------------------------------------------------------------------------
-   Enumeration of the various QoS cmds 
+   Enumeration of the various QoS cmds
 ---------------------------------------------------------------------------*/
 typedef enum
 {
@@ -138,7 +138,7 @@ typedef enum
    SME_QOS_CMD_MAX
 }sme_QosCmdType;
 /*---------------------------------------------------------------------------
-   Enumeration of the various QoS reason codes to be used in the Flow list 
+   Enumeration of the various QoS reason codes to be used in the Flow list
 ---------------------------------------------------------------------------*/
 typedef enum
 {
@@ -151,7 +151,7 @@ typedef enum
 }sme_QosReasonType;
 
 /*---------------------------------------------------------------------------
-  Table to map user priority passed in as an argument to appropriate Access 
+  Table to map user priority passed in as an argument to appropriate Access
   Category as specified in 802.11e/WMM
 ---------------------------------------------------------------------------*/
 sme_QosEdcaAcType sme_QosUPtoACMap[SME_QOS_WMM_UP_MAX] =
@@ -172,7 +172,7 @@ sme_QosEdcaAcType sme_QosUPtoACMap[SME_QOS_WMM_UP_MAX] =
   Note: there is a quantization loss here because 4 ACs are mapped to 8 UPs
   Mapping is done for consistency
 ---------------------------------------------------------------------------*/
-sme_QosWmmUpType sme_QosACtoUPMap[SME_QOS_EDCA_AC_MAX] = 
+sme_QosWmmUpType sme_QosACtoUPMap[SME_QOS_EDCA_AC_MAX] =
 {
    SME_QOS_WMM_UP_BE,   /* AC BE */
    SME_QOS_WMM_UP_BK,   /* AC BK */
@@ -181,8 +181,8 @@ sme_QosWmmUpType sme_QosACtoUPMap[SME_QOS_EDCA_AC_MAX] =
 };
 /*---------------------------------------------------------------------------
 DESCRIPTION
-  SME QoS module's FLOW Link List structure. This list can hold information per 
-  flow/request, like TSPEC params requested, which AC it is running on 
+  SME QoS module's FLOW Link List structure. This list can hold information per
+  flow/request, like TSPEC params requested, which AC it is running on
 ---------------------------------------------------------------------------*/
 typedef struct sme_QosFlowInfoEntry_s
 {
@@ -197,12 +197,12 @@ typedef struct sme_QosFlowInfoEntry_s
     sme_QosCallback       QoSCallback;
     v_BOOL_t              hoRenewal;//set to TRUE while re-negotiating flows after
                                      //handoff, will set to FALSE once done with
-                                     //the process. Helps SME to decide if at all 
+                                     //the process. Helps SME to decide if at all
                                      //to notify HDD/LIS for flow renewal after HO
 } sme_QosFlowInfoEntry;
 /*---------------------------------------------------------------------------
 DESCRIPTION
-  SME QoS module's setup request cmd related information structure. 
+  SME QoS module's setup request cmd related information structure.
 ---------------------------------------------------------------------------*/
 typedef struct sme_QosSetupCmdInfo_s
 {
@@ -213,12 +213,12 @@ typedef struct sme_QosSetupCmdInfo_s
     sme_QosWmmUpType      UPType;
     v_BOOL_t              hoRenewal;//set to TRUE while re-negotiating flows after
                                      //handoff, will set to FALSE once done with
-                                     //the process. Helps SME to decide if at all 
+                                     //the process. Helps SME to decide if at all
                                      //to notify HDD/LIS for flow renewal after HO
 } sme_QosSetupCmdInfo;
 /*---------------------------------------------------------------------------
 DESCRIPTION
-  SME QoS module's modify cmd related information structure. 
+  SME QoS module's modify cmd related information structure.
 ---------------------------------------------------------------------------*/
 typedef struct sme_QosModifyCmdInfo_s
 {
@@ -228,7 +228,7 @@ typedef struct sme_QosModifyCmdInfo_s
 } sme_QosModifyCmdInfo;
 /*---------------------------------------------------------------------------
 DESCRIPTION
-  SME QoS module's resend cmd related information structure. 
+  SME QoS module's resend cmd related information structure.
 ---------------------------------------------------------------------------*/
 typedef struct sme_QosResendCmdInfo_s
 {
@@ -238,7 +238,7 @@ typedef struct sme_QosResendCmdInfo_s
 } sme_QosResendCmdInfo;
 /*---------------------------------------------------------------------------
 DESCRIPTION
-  SME QoS module's release cmd related information structure. 
+  SME QoS module's release cmd related information structure.
 ---------------------------------------------------------------------------*/
 typedef struct sme_QosReleaseCmdInfo_s
 {
@@ -246,7 +246,7 @@ typedef struct sme_QosReleaseCmdInfo_s
 } sme_QosReleaseCmdInfo;
 /*---------------------------------------------------------------------------
 DESCRIPTION
-  SME QoS module's buffered cmd related information structure. 
+  SME QoS module's buffered cmd related information structure.
 ---------------------------------------------------------------------------*/
 typedef struct sme_QosCmdInfo_s
 {
@@ -263,7 +263,7 @@ typedef struct sme_QosCmdInfo_s
 } sme_QosCmdInfo;
 /*---------------------------------------------------------------------------
 DESCRIPTION
-  SME QoS module's buffered cmd List structure. This list can hold information 
+  SME QoS module's buffered cmd List structure. This list can hold information
   related to any pending cmd from HDD
 ---------------------------------------------------------------------------*/
 typedef struct sme_QosCmdInfoEntry_s
@@ -274,7 +274,7 @@ typedef struct sme_QosCmdInfoEntry_s
 /*---------------------------------------------------------------------------
 DESCRIPTION
   SME QoS module's Per AC information structure. This can hold information on
-  how many flows running on the AC, the current, previous states the AC is in 
+  how many flows running on the AC, the current, previous states the AC is in
 ---------------------------------------------------------------------------*/
 typedef struct sme_QosACInfo_s
 {
@@ -284,13 +284,13 @@ typedef struct sme_QosACInfo_s
    sme_QosWmmTspecInfo    curr_QoSInfo[SME_QOS_TSPEC_INDEX_MAX];
    sme_QosWmmTspecInfo    requested_QoSInfo[SME_QOS_TSPEC_INDEX_MAX];
    v_BOOL_t               reassoc_pending;//reassoc requested for APSD
-   //As per WMM spec there could be max 2 TSPEC running on the same AC with 
+   //As per WMM spec there could be max 2 TSPEC running on the same AC with
    //different direction. We will refer each TSPEC with an index
    v_U8_t                 tspec_mask_status; //status showing if both the indices are in use
    v_U8_t                 tspec_pending;//tspec negotiation going on for which index
    v_BOOL_t               hoRenewal;//set to TRUE while re-negotiating flows after
                                     //handoff, will set to FALSE once done with
-                                    //the process. Helps SME to decide if at all 
+                                    //the process. Helps SME to decide if at all
                                     //to notify HDD/LIS for flow renewal after HO
 #ifdef WLAN_FEATURE_VOWIFI_11R
    v_U8_t                 ricIdentifier[SME_QOS_TSPEC_INDEX_MAX];
@@ -314,14 +314,14 @@ typedef struct sme_QosSessionInfo_s
    v_BOOL_t               sessionActive;
    // All AC info for this session
    sme_QosACInfo          ac_info[SME_QOS_EDCA_AC_MAX];
-   // Bitmask of the ACs with APSD on 
+   // Bitmask of the ACs with APSD on
    // Bit0:VO; Bit1:VI; Bit2:BK; Bit3:BE all other bits are ignored
    v_U8_t                 apsdMask;
    // association information for this session
    sme_QosAssocInfo       assocInfo;
    // ID assigned to our reassoc request
    v_U32_t                roamID;
-   // maintaining a powersave status in QoS module, to be fed back to PMC at 
+   // maintaining a powersave status in QoS module, to be fed back to PMC at
    // times through the sme_QosPmcCheckRoutine
    v_BOOL_t               readyForPowerSave;
    // are we in the process of handing off to a different AP
@@ -338,7 +338,7 @@ typedef struct sme_QosSessionInfo_s
 } sme_QosSessionInfo;
 /*---------------------------------------------------------------------------
 DESCRIPTION
-  Search key union. We can use the flowID, ac type, or reason to find an entry 
+  Search key union. We can use the flowID, ac type, or reason to find an entry
   in the flow list
 ---------------------------------------------------------------------------*/
 typedef union sme_QosSearchKey_s
@@ -382,28 +382,28 @@ struct sme_QosCb_s
    v_U8_t                nextDialogToken;
 }sme_QosCb;
 typedef eHalStatus (*sme_QosProcessSearchEntry)(tpAniSirGlobal pMac, tListElem *pEntry);
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
                          Internal function declarations
   ------------------------------------------------------------------------*/
-sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac, 
+sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
                                           v_U8_t sessionId,
                                           sme_QosWmmTspecInfo * pQoSInfo,
-                                          sme_QosCallback QoSCallback, 
+                                          sme_QosCallback QoSCallback,
                                           void * HDDcontext,
-                                          sme_QosWmmUpType UPType, 
+                                          sme_QosWmmUpType UPType,
                                           v_U32_t QosFlowID,
                                           v_BOOL_t buffered_cmd,
                                           v_BOOL_t hoRenewal);
-sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac, 
+sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
                                            sme_QosWmmTspecInfo * pQoSInfo,
                                            v_U32_t QosFlowID,
                                            v_BOOL_t buffered_cmd);
-sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac, 
+sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
                                             v_U32_t QosFlowID,
                                             v_BOOL_t buffered_cmd);
 sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
                                v_U8_t sessionId,
-                               sme_QosWmmTspecInfo *pTspec_Info, 
+                               sme_QosWmmTspecInfo *pTspec_Info,
                                sme_QosEdcaAcType ac);
 eHalStatus sme_QosAddTsReq(tpAniSirGlobal pMac,
                            v_U8_t sessionId,
@@ -431,10 +431,10 @@ eHalStatus sme_QosProcessSetKeySuccessInd(tpAniSirGlobal pMac, v_U8_t sessionId,
 eHalStatus sme_QosProcessAggrQosRsp(tpAniSirGlobal pMac, void *pMsgBuf);
 eHalStatus sme_QosFTAggrQosReq( tpAniSirGlobal pMac, v_U8_t sessionId );
 #endif
-eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac, 
+eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac,
                                          v_U8_t sessionId,
                                          tSirAddtsRspInfo * pRsp);
-eHalStatus sme_QosProcessAddTsFailureRsp(tpAniSirGlobal pMac, 
+eHalStatus sme_QosProcessAddTsFailureRsp(tpAniSirGlobal pMac,
                                          v_U8_t sessionId,
                                          tSirAddtsRspInfo * pRsp);
 eHalStatus sme_QosAggregateParams(
@@ -443,15 +443,15 @@ eHalStatus sme_QosAggregateParams(
    sme_QosWmmTspecInfo * pUpdated_Tspec_Info);
 static eHalStatus sme_QosUpdateParams(v_U8_t sessionId,
                                       sme_QosEdcaAcType ac,
-                                      v_U8_t tspec_mask, 
+                                      v_U8_t tspec_mask,
                                       sme_QosWmmTspecInfo * pTspec_Info);
 sme_QosWmmUpType sme_QosAcToUp(sme_QosEdcaAcType ac);
 sme_QosEdcaAcType sme_QosUpToAc(sme_QosWmmUpType up);
-v_BOOL_t sme_QosIsACM(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, 
+v_BOOL_t sme_QosIsACM(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc,
                       sme_QosEdcaAcType ac, tDot11fBeaconIEs *pIes);
 tListElem *sme_QosFindInFlowList(sme_QosSearchInfo search_key);
 eHalStatus sme_QosFindAllInFlowList(tpAniSirGlobal pMac,
-                                    sme_QosSearchInfo search_key, 
+                                    sme_QosSearchInfo search_key,
                                     sme_QosProcessSearchEntry fnp);
 static void sme_QosStateTransition(v_U8_t sessionId,
                                    sme_QosEdcaAcType ac,
@@ -522,22 +522,22 @@ static v_U8_t sme_QosAssignDialogToken(void);
 static eHalStatus sme_QosUpdateTspecMask(v_U8_t sessionId,
                                       sme_QosSearchInfo search_key,
                                       v_U8_t new_tspec_mask);
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
                          External APIs definitions
   ------------------------------------------------------------------------*/
 /* --------------------------------------------------------------------------
-    \brief sme_QosOpen() - This function must be called before any API call to 
+    \brief sme_QosOpen() - This function must be called before any API call to
     SME QoS module.
     \param pMac - Pointer to the global MAC parameter structure.
-    
-    \return eHalStatus     
+
+    \return eHalStatus
 ----------------------------------------------------------------------------*/
 eHalStatus sme_QosOpen(tpAniSirGlobal pMac)
 {
    sme_QosSessionInfo *pSession;
    v_U8_t sessionId;
    eHalStatus status;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: initializing SME-QoS module",
              __func__, __LINE__);
    //init the control block
@@ -555,7 +555,7 @@ eHalStatus sme_QosOpen(tpAniSirGlobal pMac)
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
    }
-   
+
    for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; ++sessionId)
    {
       pSession = &sme_QosCb.sessionInfo[sessionId];
@@ -629,25 +629,25 @@ eHalStatus sme_QosOpen(tpAniSirGlobal pMac)
          return eHAL_STATUS_FAILURE;
       }
    }
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: done initializing SME-QoS module",
              __func__, __LINE__);
    return eHAL_STATUS_SUCCESS;
 }
 /* --------------------------------------------------------------------------
-    \brief sme_QosClose() - To close down SME QoS module. There should not be 
+    \brief sme_QosClose() - To close down SME QoS module. There should not be
     any API call into this module after calling this function until another
     call of sme_QosOpen.
     \param pMac - Pointer to the global MAC parameter structure.
-    
-    \return eHalStatus     
+
+    \return eHalStatus
 ----------------------------------------------------------------------------*/
 eHalStatus sme_QosClose(tpAniSirGlobal pMac)
 {
    sme_QosSessionInfo *pSession;
    sme_QosEdcaAcType ac;
    v_U8_t sessionId;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: closing down SME-QoS",
              __func__, __LINE__);
    if(!pMac->psOffloadEnabled)
@@ -724,50 +724,50 @@ eHalStatus sme_QosClose(tpAniSirGlobal pMac)
 
       // close the session's buffered command list
       csrLLClose(&pSession->bufferedCommandList);
-      for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+      for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
       {
          sme_QosStateTransition(sessionId, ac, SME_QOS_CLOSED);
       }
       pSession->sessionActive = VOS_FALSE;
       pSession->readyForPowerSave = VOS_TRUE;
    }
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: closed down QoS",
              __func__, __LINE__);
    return eHAL_STATUS_SUCCESS;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosSetupReq() - The SME QoS API exposed to HDD to request for QoS 
-  on a particular AC. This function should be called after a link has been 
-  established, i.e. STA is associated with an AP etc. If the request involves 
-  admission control on the requested AC, HDD needs to provide the necessary 
+  \brief sme_QosSetupReq() - The SME QoS API exposed to HDD to request for QoS
+  on a particular AC. This function should be called after a link has been
+  established, i.e. STA is associated with an AP etc. If the request involves
+  admission control on the requested AC, HDD needs to provide the necessary
   Traffic Specification (TSPEC) parameters otherwise SME is going to use the
   default params.
-  
+
   \param hHal - The handle returned by macOpen.
   \param sessionId - sessionId returned by sme_OpenSession.
   \param pQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM TSPEC
                     related info as defined above, provided by HDD
-  \param QoSCallback - The callback which is registered per flow while 
-                       requesting for QoS. Used for any notification for the 
-                       flow (i.e. setup success/failure/release) which needs to 
+  \param QoSCallback - The callback which is registered per flow while
+                       requesting for QoS. Used for any notification for the
+                       flow (i.e. setup success/failure/release) which needs to
                        be sent to HDD
-  \param HDDcontext - A cookie passed by HDD to be used by SME during any QoS 
-                      notification (through the callabck) to HDD 
+  \param HDDcontext - A cookie passed by HDD to be used by SME during any QoS
+                      notification (through the callabck) to HDD
   \param UPType - Useful only if HDD or any other upper layer module (BAP etc.)
-                  looking for implicit QoS setup, in that 
+                  looking for implicit QoS setup, in that
                   case, the pQoSInfo will be NULL & SME will know about the AC
                   (from the UP provided in this param) QoS is requested on
-  \param pQosFlowID - Identification per flow running on each AC generated by 
-                      SME. 
-                     It is only meaningful if the QoS setup for the flow is 
+  \param pQosFlowID - Identification per flow running on each AC generated by
+                      SME.
+                     It is only meaningful if the QoS setup for the flow is
                      successful
-                  
+
   \return eHAL_STATUS_SUCCESS - Setup is successful.
-  
-          Other status means Setup request failed     
+
+          Other status means Setup request failed
   \sa
-  
+
   --------------------------------------------------------------------------*/
 sme_QosStatusType sme_QosSetupReq(tHalHandle hHal, tANI_U32 sessionId,
                                   sme_QosWmmTspecInfo * pQoSInfo,
@@ -779,14 +779,14 @@ sme_QosStatusType sme_QosSetupReq(tHalHandle hHal, tANI_U32 sessionId,
    eHalStatus lock_status = eHAL_STATUS_FAILURE;
    tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
    sme_QosStatusType status;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: QoS Setup requested by client on session %d",
              __func__, __LINE__,
              sessionId);
    lock_status = sme_AcquireGlobalLock( &pMac->sme );
    if ( !HAL_STATUS_SUCCESS( lock_status ) )
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Unable to obtain lock",
                 __func__, __LINE__);
       return SME_QOS_STATUS_SETUP_FAILURE_RSP;
@@ -794,7 +794,7 @@ sme_QosStatusType sme_QosSetupReq(tHalHandle hHal, tANI_U32 sessionId,
    //Make sure the session is valid
    if (!CSR_IS_SESSION_VALID( pMac, sessionId ))
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Supplied Session ID %d is invalid",
                 __func__, __LINE__,
                 sessionId);
@@ -805,8 +805,8 @@ sme_QosStatusType sme_QosSetupReq(tHalHandle hHal, tANI_U32 sessionId,
       //Make sure the session is active
       pSession = &sme_QosCb.sessionInfo[sessionId];
       if (!pSession->sessionActive)
-      { 
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      {
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: Supplied Session ID %d is inactive",
                    __func__, __LINE__,
                    sessionId);
@@ -816,7 +816,7 @@ sme_QosStatusType sme_QosSetupReq(tHalHandle hHal, tANI_U32 sessionId,
       {
          //Assign a Flow ID
          *pQosFlowID = sme_QosAssignFlowId();
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                    "%s: %d: QoS request on session %d assigned Flow ID %d",
                    __func__, __LINE__,
                    sessionId, *pQosFlowID);
@@ -828,7 +828,7 @@ sme_QosStatusType sme_QosSetupReq(tHalHandle hHal, tANI_U32 sessionId,
       }
    }
    sme_ReleaseGlobalLock( &pMac->sme );
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: QoS setup return status on session %d is %d",
              __func__, __LINE__,
              sessionId, status);
@@ -836,43 +836,43 @@ sme_QosStatusType sme_QosSetupReq(tHalHandle hHal, tANI_U32 sessionId,
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosModifyReq() - The SME QoS API exposed to HDD to request for 
-  modification of certain QoS params on a flow running on a particular AC. 
-  This function should be called after a link has been established, i.e. STA is 
-  associated with an AP etc. & a QoS setup has been succesful for that flow. 
-  If the request involves admission control on the requested AC, HDD needs to 
+  \brief sme_QosModifyReq() - The SME QoS API exposed to HDD to request for
+  modification of certain QoS params on a flow running on a particular AC.
+  This function should be called after a link has been established, i.e. STA is
+  associated with an AP etc. & a QoS setup has been succesful for that flow.
+  If the request involves admission control on the requested AC, HDD needs to
   provide the necessary Traffic Specification (TSPEC) parameters & SME might
   start the renegotiation process through ADDTS.
-  
+
   \param hHal - The handle returned by macOpen.
   \param pQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM TSPEC
                     related info as defined above, provided by HDD
-  \param QosFlowID - Identification per flow running on each AC generated by 
-                      SME. 
-                     It is only meaningful if the QoS setup for the flow has 
+  \param QosFlowID - Identification per flow running on each AC generated by
+                      SME.
+                     It is only meaningful if the QoS setup for the flow has
                      been successful already
-                  
+
   \return SME_QOS_STATUS_SETUP_SUCCESS_RSP - Modification is successful.
-  
-          Other status means request failed     
+
+          Other status means request failed
   \sa
-  
+
   --------------------------------------------------------------------------*/
-sme_QosStatusType sme_QosModifyReq(tHalHandle hHal, 
+sme_QosStatusType sme_QosModifyReq(tHalHandle hHal,
                                    sme_QosWmmTspecInfo * pQoSInfo,
                                    v_U32_t QosFlowID)
 {
    eHalStatus lock_status = eHAL_STATUS_FAILURE;
    tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
    sme_QosStatusType status;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: QoS Modify requested by client for Flow %d",
              __func__, __LINE__,
              QosFlowID);
    lock_status = sme_AcquireGlobalLock( &pMac->sme );
    if ( !HAL_STATUS_SUCCESS( lock_status ) )
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Unable to obtain lock",
                 __func__, __LINE__);
       return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP;
@@ -880,41 +880,41 @@ sme_QosStatusType sme_QosModifyReq(tHalHandle hHal,
    //Call the internal function for QoS modify, adding a layer of abstraction
    status = sme_QosInternalModifyReq(pMac, pQoSInfo, QosFlowID, VOS_FALSE);
    sme_ReleaseGlobalLock( &pMac->sme );
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: QoS Modify return status on Flow %d is %d",
              __func__, __LINE__,
              QosFlowID, status);
    return status;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosReleaseReq() - The SME QoS API exposed to HDD to request for 
-  releasing a QoS flow running on a particular AC. This function should be 
-  called only if a QoS is set up with a valid FlowID. HDD sould invoke this 
-  API only if an explicit request for QoS release has come from Application 
-  
+  \brief sme_QosReleaseReq() - The SME QoS API exposed to HDD to request for
+  releasing a QoS flow running on a particular AC. This function should be
+  called only if a QoS is set up with a valid FlowID. HDD sould invoke this
+  API only if an explicit request for QoS release has come from Application
+
   \param hHal - The handle returned by macOpen.
   \param QosFlowID - Identification per flow running on each AC generated by SME
-                     It is only meaningful if the QoS setup for the flow is 
+                     It is only meaningful if the QoS setup for the flow is
                      successful
-  
+
   \return eHAL_STATUS_SUCCESS - Release is successful.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 sme_QosStatusType sme_QosReleaseReq(tHalHandle hHal, v_U32_t QosFlowID)
 {
    eHalStatus lock_status = eHAL_STATUS_FAILURE;
    tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
    sme_QosStatusType status;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: QoS Release requested by client for Flow %d",
              __func__, __LINE__,
              QosFlowID);
    lock_status = sme_AcquireGlobalLock( &pMac->sme );
    if ( !HAL_STATUS_SUCCESS( lock_status ) )
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Unable to obtain lock",
                 __func__, __LINE__);
       return SME_QOS_STATUS_RELEASE_FAILURE_RSP;
@@ -922,24 +922,24 @@ sme_QosStatusType sme_QosReleaseReq(tHalHandle hHal, v_U32_t QosFlowID)
    //Call the internal function for QoS release, adding a layer of abstraction
    status = sme_QosInternalReleaseReq(pMac, QosFlowID, VOS_FALSE);
    sme_ReleaseGlobalLock( &pMac->sme );
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: QoS Release return status on Flow %d is %d",
              __func__, __LINE__,
              QosFlowID, status);
    return status;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosSetParams() - This function is used by HDD to provide the 
+  \brief sme_QosSetParams() - This function is used by HDD to provide the
    default TSPEC params to SME.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
   \param pQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM TSPEC
                     related info per AC as defined above, provided by HDD
-  
+
   \return eHAL_STATUS_SUCCESS - Setparam is successful.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosSetParams(tpAniSirGlobal pMac, sme_QosWmmTspecInfo * pQoSInfo)
 {
@@ -949,7 +949,7 @@ eHalStatus sme_QosSetParams(tpAniSirGlobal pMac, sme_QosWmmTspecInfo * pQoSInfo)
    if(SME_QOS_EDCA_AC_MAX == ac)
    {
       //err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Invalid AC %d (via UP %d)",
                 __func__, __LINE__,
                 ac, pQoSInfo->ts_info.up );
@@ -957,7 +957,7 @@ eHalStatus sme_QosSetParams(tpAniSirGlobal pMac, sme_QosWmmTspecInfo * pQoSInfo)
    }
    //copy over the default params for this AC
    sme_QosCb.def_QoSInfo[ac] = *pQoSInfo;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: QoS default params set for AC %d (via UP %d)",
              __func__, __LINE__,
              ac, pQoSInfo->ts_info.up );
@@ -971,27 +971,27 @@ void qosReleaseCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosMsgProcessor() - sme_ProcessMsg() calls this function for the 
+  \brief sme_QosMsgProcessor() - sme_ProcessMsg() calls this function for the
   messages that are handled by SME QoS module.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
   \param msg_type - the type of msg passed by PE as defined in wniApi.h
-  \param pMsgBuf - a pointer to a buffer that maps to various structures base 
+  \param pMsgBuf - a pointer to a buffer that maps to various structures base
                    on the message type.
                    The beginning of the buffer can always map to tSirSmeRsp.
-  
+
   \return eHAL_STATUS_SUCCESS - Validation is successful.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
-eHalStatus sme_QosMsgProcessor( tpAniSirGlobal pMac,  v_U16_t msg_type, 
+eHalStatus sme_QosMsgProcessor( tpAniSirGlobal pMac,  v_U16_t msg_type,
                                 void *pMsgBuf)
 {
    eHalStatus status = eHAL_STATUS_FAILURE;
    tListElem *pEntry;
    tSmeCmd *pCommand;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: msg = %d for QoS",
              __func__, __LINE__, msg_type);
    //switch on the msg type & make the state transition accordingly
@@ -1040,7 +1040,7 @@ eHalStatus sme_QosMsgProcessor( tpAniSirGlobal pMac,  v_U16_t msg_type,
 
       default:
          //err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: unknown msg type = %d",
                    __func__, __LINE__, msg_type);
          break;
@@ -1050,17 +1050,17 @@ eHalStatus sme_QosMsgProcessor( tpAniSirGlobal pMac,  v_U16_t msg_type,
 /*--------------------------------------------------------------------------
   \brief sme_QosValidateParams() - The SME QoS API exposed to CSR to validate AP
   capabilities regarding QoS support & any other QoS parameter validation.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
-  \param pBssDesc - Pointer to the BSS Descriptor information passed down by 
+  \param pBssDesc - Pointer to the BSS Descriptor information passed down by
                     CSR to PE while issuing the Join request
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
-eHalStatus sme_QosValidateParams(tpAniSirGlobal pMac, 
+eHalStatus sme_QosValidateParams(tpAniSirGlobal pMac,
                                  tSirBssDescription *pBssDesc)
 {
    tDot11fBeaconIEs *pIes = NULL;
@@ -1073,7 +1073,7 @@ eHalStatus sme_QosValidateParams(tpAniSirGlobal pMac,
       if(!HAL_STATUS_SUCCESS(csrGetParsedBssDescriptionIEs(pMac, pBssDesc, &pIes)))
       {
          //err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: csrGetParsedBssDescriptionIEs() failed",
                    __func__, __LINE__);
          break;
@@ -1082,24 +1082,24 @@ eHalStatus sme_QosValidateParams(tpAniSirGlobal pMac,
       if( !CSR_IS_QOS_BSS(pIes) )
       {
          //err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: AP doesn't support QoS",
                    __func__, __LINE__);
-         
+
          break;
       }
       if(!(pIes->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD) &&
          !(pIes->WMMInfoAp.uapsd))
       {
          //err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: AP doesn't support APSD",
                    __func__, __LINE__);
          break;
       }
       status = eHAL_STATUS_SUCCESS;
    }while(0);
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: validated with status = %d",
              __func__, __LINE__, status);
    if(pIes)
@@ -1109,24 +1109,24 @@ eHalStatus sme_QosValidateParams(tpAniSirGlobal pMac,
    return status;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosCsrEventInd() - The QoS sub-module in SME expects notifications 
+  \brief sme_QosCsrEventInd() - The QoS sub-module in SME expects notifications
   from CSR when certain events occur as mentioned in sme_QosCsrEventIndType.
   \param pMac - Pointer to the global MAC parameter structure.
   \param ind - The event occurred of type sme_QosCsrEventIndType.
   \param pEvent_info - Information related to the event
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosCsrEventInd(tpAniSirGlobal pMac,
                               v_U8_t sessionId,
-                              sme_QosCsrEventIndType ind, 
+                              sme_QosCsrEventIndType ind,
                               void *pEvent_info)
 {
    eHalStatus status = eHAL_STATUS_FAILURE;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: On Session %d Event %d received from CSR",
              __func__, __LINE__,
              sessionId, ind );
@@ -1181,13 +1181,13 @@ eHalStatus sme_QosCsrEventInd(tpAniSirGlobal pMac,
 #endif
       default:
          //Err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: On Session %d Unknown Event %d received from CSR",
                    __func__, __LINE__,
                    sessionId, ind );
          break;
    }
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: On Session %d processed Event %d with status %d",
              __func__, __LINE__,
              sessionId, ind, status );
@@ -1201,15 +1201,15 @@ eHalStatus sme_QosCsrEventInd(tpAniSirGlobal pMac,
   \param pSirBssDesc - The event occurred of type sme_QosCsrEventIndType.
 
   \return a bit mask indicating for which ACs AP has ACM set to 1
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 v_U8_t sme_QosGetACMMask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes)
 {
    sme_QosEdcaAcType ac;
    v_U8_t acm_mask = 0;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked",
              __func__, __LINE__);
    for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
@@ -1218,55 +1218,55 @@ v_U8_t sme_QosGetACMMask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, t
       {
          acm_mask = acm_mask | (1 << (SME_QOS_EDCA_AC_VO - ac));
       }
-      
+
    }
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: mask is %d",
              __func__, __LINE__, acm_mask);
    return acm_mask;
 }
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
                          Internal function definitions
   ------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------
   \brief sme_QosInternalSetupReq() - The SME QoS internal setup request handling
   function.
-  If the request involves admission control on the requested AC, HDD needs to 
-  provide the necessary Traffic Specification (TSPEC) parameters otherwise SME 
+  If the request involves admission control on the requested AC, HDD needs to
+  provide the necessary Traffic Specification (TSPEC) parameters otherwise SME
   is going to use the default params.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
   \param pQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM TSPEC
                     related info as defined above, provided by HDD
-  \param QoSCallback - The callback which is registered per flow while 
-                       requesting for QoS. Used for any notification for the 
-                       flow (i.e. setup success/failure/release) which needs to 
+  \param QoSCallback - The callback which is registered per flow while
+                       requesting for QoS. Used for any notification for the
+                       flow (i.e. setup success/failure/release) which needs to
                        be sent to HDD
-  \param HDDcontext - A cookie passed by HDD to be used by SME during any QoS 
-                      notification (through the callabck) to HDD 
+  \param HDDcontext - A cookie passed by HDD to be used by SME during any QoS
+                      notification (through the callabck) to HDD
   \param UPType - Useful only if HDD or any other upper layer module (BAP etc.)
-                  looking for implicit QoS setup, in that 
+                  looking for implicit QoS setup, in that
                   case, the pQoSInfo will be NULL & SME will know about the AC
                   (from the UP provided in this param) QoS is requested on
-  \param QosFlowID - Identification per flow running on each AC generated by 
-                      SME. 
-                     It is only meaningful if the QoS setup for the flow is 
+  \param QosFlowID - Identification per flow running on each AC generated by
+                      SME.
+                     It is only meaningful if the QoS setup for the flow is
                      successful
-  \param buffered_cmd - tells us if the cmd was a buffered one or fresh from 
+  \param buffered_cmd - tells us if the cmd was a buffered one or fresh from
                         client
-                  
+
   \return eHAL_STATUS_SUCCESS - Setup is successful.
-  
-          Other status means Setup request failed     
+
+          Other status means Setup request failed
   \sa
-  
+
   --------------------------------------------------------------------------*/
-sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac, 
+sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
                                           v_U8_t sessionId,
                                           sme_QosWmmTspecInfo * pQoSInfo,
-                                          sme_QosCallback QoSCallback, 
+                                          sme_QosCallback QoSCallback,
                                           void * HDDcontext,
-                                          sme_QosWmmUpType UPType, 
+                                          sme_QosWmmUpType UPType,
                                           v_U32_t QosFlowID,
                                           v_BOOL_t buffered_cmd,
                                           v_BOOL_t hoRenewal)
@@ -1284,7 +1284,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
    sme_QosSearchInfo search_key;
    v_BOOL_t bufferCommand;
    eHalStatus hstatus;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d for flow %d",
              __func__, __LINE__,
              sessionId, QosFlowID);
@@ -1292,18 +1292,18 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
    // if caller sent an empty TSPEC, fill up with the default one
    if(!pQoSInfo)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
                 "%s: %d: caller sent an empty QoS param list, using defaults",
                 __func__, __LINE__);
       // find the AC with UPType passed in
       ac = sme_QosUpToAc(UPType);
       if(SME_QOS_EDCA_AC_MAX == ac)
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: invalid AC %d from UP %d",
                    __func__, __LINE__,
                    ac, UPType);
-         
+
          return SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP;
       }
       Tspec_Info = sme_QosCb.def_QoSInfo[ac];
@@ -1314,17 +1314,17 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
       ac = sme_QosUpToAc(pQoSInfo->ts_info.up);
       if(SME_QOS_EDCA_AC_MAX == ac)
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: invalid AC %d from UP %d",
                    __func__, __LINE__,
                    ac, pQoSInfo->ts_info.up);
-         
+
          return SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP;
       }
       //validate QoS params
       if(!sme_QosValidateRequestedParams(pMac, pQoSInfo, sessionId))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: invalid params",
                    __func__, __LINE__);
          return SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP;
@@ -1337,16 +1337,16 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
    // assume we won't have to (re)buffer the command
    bufferCommand = VOS_FALSE;
    //check to consider the following flowing scenario
-   //Addts request is pending on one AC, while APSD requested on another which 
-   //needs a reassoc. Will buffer a request if Addts is pending on any AC, 
-   //which will safegaurd the above scenario, & also won't confuse PE with back 
+   //Addts request is pending on one AC, while APSD requested on another which
+   //needs a reassoc. Will buffer a request if Addts is pending on any AC,
+   //which will safegaurd the above scenario, & also won't confuse PE with back
    //to back Addts or Addts followed by Reassoc
    if(sme_QosIsRspPending(sessionId, ac))
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
                 "%s: %d: buffering the setup request for flow %d in state %d "
                 "since another request is pending",
-                __func__, __LINE__, 
+                __func__, __LINE__,
                 QosFlowID, pACInfo->curr_state );
       bufferCommand = VOS_TRUE;
    }
@@ -1368,10 +1368,10 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
 
       if( eHAL_STATUS_PMC_PENDING == hstatus )
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
                    "%s: %d: buffering the setup request for flow %d in state %d, "
                    "waiting for full power",
-                   __func__, __LINE__, 
+                   __func__, __LINE__,
                    QosFlowID, pACInfo->curr_state );
          bufferCommand = VOS_TRUE;
       }
@@ -1391,7 +1391,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
       hstatus = sme_QosBufferCmd(&cmd, buffered_cmd);
       if(!HAL_STATUS_SUCCESS(hstatus))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: couldn't buffer the setup request in state = %d",
                    __func__, __LINE__,
                    pACInfo->curr_state );
@@ -1400,7 +1400,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
          pSession->readyForPowerSave = VOS_TRUE;
          return SME_QOS_STATUS_SETUP_FAILURE_RSP;
       }
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Buffered setup request for flow = %d",
                 __func__, __LINE__,
                 QosFlowID);
@@ -1414,7 +1414,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
       //call the internal qos setup logic to decide on if the
       // request is NOP, or need reassoc for APSD and/or need to send out ADDTS
       status = sme_QosSetup(pMac, sessionId, &Tspec_Info, ac);
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: On session %d with AC %d in state SME_QOS_LINK_UP "
                 "sme_QosSetup returned with status %d",
                 __func__, __LINE__,
@@ -1454,7 +1454,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
             if(pACInfo->tspec_mask_status &&
                !pACInfo->reassoc_pending)
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                          "%s: %d: On session %d with AC %d in state "
                             "SME_QOS_LINK_UP tspec_mask_status is %d "
                          "but should not be set yet",
@@ -1471,7 +1471,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
                // we didn't request for reassoc, it must be a tspec negotiation
                pACInfo->tspec_pending = 1;
             }
-             
+
             pentry->reason = SME_QOS_REASON_SETUP;
             new_state = SME_QOS_REQUESTED;
          }
@@ -1485,7 +1485,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
             pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0] = Tspec_Info;
             if(buffered_cmd && !pentry->hoRenewal)
             {
-               QoSCallback(pMac, HDDcontext, 
+               QoSCallback(pMac, HDDcontext,
                            &pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0],
                            status,
                            pentry->QosFlowID);
@@ -1494,11 +1494,11 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
          }
          pACInfo->num_flows[SME_QOS_TSPEC_INDEX_0]++;
 
-         //indicate on which index the flow entry belongs to & add it to the 
+         //indicate on which index the flow entry belongs to & add it to the
          //Flow List at the end
          pentry->tspec_mask = pACInfo->tspec_mask_status;
          pentry->QoSInfo = Tspec_Info;
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                    "%s: %d: Creating entry on session %d at %p with flowID %d",
                    __func__, __LINE__,
                    sessionId, pentry, QosFlowID);
@@ -1507,7 +1507,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
       else
       {
          // unexpected status returned by sme_QosSetup()
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: On session %d unexpected status %d "
                    "returned by sme_QosSetup",
                    __func__, __LINE__,
@@ -1515,7 +1515,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
          new_state = pACInfo->curr_state;
          if(buffered_cmd && hoRenewal)
          {
-            QoSCallback(pMac, HDDcontext, 
+            QoSCallback(pMac, HDDcontext,
                         &pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0],
                         SME_QOS_STATUS_RELEASE_QOS_LOST_IND,
                         QosFlowID);
@@ -1524,7 +1524,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
       break;
    case SME_QOS_HANDOFF:
    case SME_QOS_REQUESTED:
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
                 "%s: %d: Buffering setup request for flow %d in state = %d",
                 __func__, __LINE__,
                 QosFlowID, pACInfo->curr_state );
@@ -1541,7 +1541,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
       hstatus = sme_QosBufferCmd(&cmd, buffered_cmd);
       if(!HAL_STATUS_SUCCESS(hstatus))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: On session %d couldn't buffer the setup "
                    "request for flow %d in state = %d",
                    __func__, __LINE__,
@@ -1555,7 +1555,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
       new_state = pACInfo->curr_state;
       break;
    case SME_QOS_QOS_ON:
-      
+
       //check if multiple flows running on the ac
       if((pACInfo->num_flows[SME_QOS_TSPEC_INDEX_0] > 0)||
          (pACInfo->num_flows[SME_QOS_TSPEC_INDEX_1] > 0))
@@ -1564,13 +1564,13 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
          if(CSR_IS_ADDTS_WHEN_ACMOFF_SUPPORTED(pMac) ||
             sme_QosIsACM(pMac, pSession->assocInfo.pBssDesc, ac, NULL))
          {
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
                       "%s: %d: tspec_mask_status = %d for AC = %d",
                       __func__, __LINE__,
                       pACInfo->tspec_mask_status, ac);
             if(!pACInfo->tspec_mask_status)
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                          "%s: %d: tspec_mask_status can't be 0 for ac = %d in "
                          "state = %d",
                          __func__, __LINE__,
@@ -1586,7 +1586,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
             if(SME_QOS_TSPEC_MASK_BIT_1_2_SET != pACInfo->tspec_mask_status)
             {
               /* Either of upstream, downstream or bidirectional flows are present */
-              /* If either of new stream or current stream is for bidirecional, aggregate 
+              /* If either of new stream or current stream is for bidirecional, aggregate
                * the new stream with the current streams present and send out aggregated Tspec.*/
               if((Tspec_Info.ts_info.direction == SME_QOS_WMM_TS_DIR_BOTH) ||
                  (pACInfo->curr_QoSInfo[pACInfo->tspec_mask_status - 1].
@@ -1625,7 +1625,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
               }
               /* New stream is also uni-directional
                * Find out the tsepc index with which it needs to be aggregated */
-              else if(pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0].ts_info.direction != 
+              else if(pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0].ts_info.direction !=
                    Tspec_Info.ts_info.direction)
               {
                 // Aggregate with 2nd tspec index
@@ -1658,22 +1658,22 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
             // create the aggregate TSPEC
             if(tmask != SME_QOS_TSPEC_MASK_BIT_1_2_SET)
             {
-              hstatus = sme_QosAggregateParams(&Tspec_Info, 
+              hstatus = sme_QosAggregateParams(&Tspec_Info,
                                                &pACInfo->curr_QoSInfo[tmask - 1],
                                                &pACInfo->requested_QoSInfo[tmask - 1]);
             }
             else
             {
-              /* Aggregate the new bidirectional stream with the existing upstreams and 
+              /* Aggregate the new bidirectional stream with the existing upstreams and
                * downstreams in tspec indices 0 and 1. */
               tmask = SME_QOS_TSPEC_MASK_BIT_1_SET;
 
-              if((hstatus = sme_QosAggregateParams(&Tspec_Info, 
+              if((hstatus = sme_QosAggregateParams(&Tspec_Info,
                                                    &pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0],
                                                    &pACInfo->requested_QoSInfo[tmask - 1]))
                           == eHAL_STATUS_SUCCESS)
               {
-                hstatus = sme_QosAggregateParams(&pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_1], 
+                hstatus = sme_QosAggregateParams(&pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_1],
                                                  &pACInfo->requested_QoSInfo[tmask - 1],
                                                  NULL);
               }
@@ -1682,7 +1682,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
             if(!HAL_STATUS_SUCCESS(hstatus))
             {
                //err msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                          "%s: %d: failed to aggregate params",
                          __func__, __LINE__);
                // unable to service the request
@@ -1699,7 +1699,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
       }
       else
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: no flows running for ac = %d while in state = %d",
                    __func__, __LINE__,
                    ac, pACInfo->curr_state );
@@ -1714,7 +1714,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
       pACInfo->requested_QoSInfo[tmask - 1].ts_info.up = Tspec_Info.ts_info.up;
       status = sme_QosSetup(pMac, sessionId,
                             &pACInfo->requested_QoSInfo[tmask - 1], ac);
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON "
                 "sme_QosSetup returned with status %d",
                 __func__, __LINE__,
@@ -1746,7 +1746,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
          pentry->hoRenewal = hoRenewal;
          pentry->QosFlowID = QosFlowID;
          pentry->sessionId = sessionId;
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                    "%s: %d: Creating flow %d",
                    __func__, __LINE__,
                    QosFlowID);
@@ -1755,11 +1755,11 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
          {
             new_state = pACInfo->curr_state;
             pentry->reason = SME_QOS_REASON_REQ_SUCCESS;
-            pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0] = 
+            pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0] =
                pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0];
             if(buffered_cmd && !pentry->hoRenewal)
             {
-               QoSCallback(pMac, HDDcontext, 
+               QoSCallback(pMac, HDDcontext,
                            &pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0],
                            status,
                            pentry->QosFlowID);
@@ -1778,7 +1778,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
                                                      sme_QosSetupFnp);
                   if(!HAL_STATUS_SUCCESS(hstatus))
                   {
-                     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+                     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                                "%s: %d: couldn't notify other "
                                "entries on this AC =%d",
                                __func__, __LINE__, ac);
@@ -1797,11 +1797,11 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
             pACInfo->tspec_pending = tmask;
          }
          pACInfo->num_flows[tmask - 1]++;
-         //indicate on which index the flow entry belongs to & add it to the 
+         //indicate on which index the flow entry belongs to & add it to the
          //Flow List at the end
          pentry->tspec_mask = tmask;
          pentry->QoSInfo = Tspec_Info;
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                    "%s: %d: On session %d creating entry at %p with flowID %d",
                    __func__, __LINE__,
                    sessionId, pentry, QosFlowID);
@@ -1810,7 +1810,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
       else
       {
          // unexpected status returned by sme_QosSetup()
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: On session %d unexpected status %d "
                    "returned by sme_QosSetup",
                    __func__, __LINE__,
@@ -1821,7 +1821,7 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
    case SME_QOS_CLOSED:
    case SME_QOS_INIT:
    default:
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: setup requested in unexpected state = %d",
                 __func__, __LINE__,
                 pACInfo->curr_state);
@@ -1837,19 +1837,19 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
       state
    */
    if((new_state != pACInfo->curr_state)&&
-      (!(pACInfo->reassoc_pending && 
+      (!(pACInfo->reassoc_pending &&
          (SME_QOS_HANDOFF == pACInfo->curr_state))))
    {
       sme_QosStateTransition(sessionId, ac, new_state);
    }
-   
-   if(pACInfo->reassoc_pending && 
+
+   if(pACInfo->reassoc_pending &&
       (SME_QOS_HANDOFF == pACInfo->curr_state))
    {
       pACInfo->prev_state = SME_QOS_REQUESTED;
    }
    if((SME_QOS_STATUS_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP == status) ||
-      (SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY == status)) 
+      (SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY == status))
    {
       (void)sme_QosProcessBufferedCmd(sessionId);
    }
@@ -1857,27 +1857,27 @@ sme_QosStatusType sme_QosInternalSetupReq(tpAniSirGlobal pMac,
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosInternalModifyReq() - The SME QoS internal function to request 
-  for modification of certain QoS params on a flow running on a particular AC. 
-  If the request involves admission control on the requested AC, HDD needs to 
+  \brief sme_QosInternalModifyReq() - The SME QoS internal function to request
+  for modification of certain QoS params on a flow running on a particular AC.
+  If the request involves admission control on the requested AC, HDD needs to
   provide the necessary Traffic Specification (TSPEC) parameters & SME might
   start the renegotiation process through ADDTS.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
   \param pQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM TSPEC
                     related info as defined above, provided by HDD
-  \param QosFlowID - Identification per flow running on each AC generated by 
-                      SME. 
-                     It is only meaningful if the QoS setup for the flow has 
+  \param QosFlowID - Identification per flow running on each AC generated by
+                      SME.
+                     It is only meaningful if the QoS setup for the flow has
                      been successful already
-                  
+
   \return SME_QOS_STATUS_SETUP_SUCCESS_RSP - Modification is successful.
-  
-          Other status means request failed     
+
+          Other status means request failed
   \sa
-  
+
   --------------------------------------------------------------------------*/
-sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac, 
+sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
                                            sme_QosWmmTspecInfo * pQoSInfo,
                                            v_U32_t QosFlowID,
                                            v_BOOL_t buffered_cmd)
@@ -1896,7 +1896,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
    v_U8_t sessionId;
    v_BOOL_t bufferCommand;
    eHalStatus hstatus;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked for flow %d",
              __func__, __LINE__,
              QosFlowID);
@@ -1911,7 +1911,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
    if(!pEntry)
    {
       //Err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: no match found for flowID = %d",
                 __func__, __LINE__,
                 QosFlowID);
@@ -1928,7 +1928,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
    //validate QoS params
    if(!sme_QosValidateRequestedParams(pMac, pQoSInfo, sessionId))
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: invalid params",
                 __func__, __LINE__);
       return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP;
@@ -1938,7 +1938,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
       (pQoSInfo->ts_info.up != flow_info->QoSInfo.ts_info.up) ||
       (pQoSInfo->ts_info.tid != flow_info->QoSInfo.ts_info.tid))
    {
-     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                "%s: %d: Modification of direction/tid/up is not allowed",
                __func__, __LINE__);
 
@@ -1949,16 +1949,16 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
    // assume we won't have to (re)buffer the command
    bufferCommand = VOS_FALSE;
    //check to consider the following flowing scenario
-   //Addts request is pending on one AC, while APSD requested on another which 
-   //needs a reassoc. Will buffer a request if Addts is pending on any AC, 
-   //which will safegaurd the above scenario, & also won't confuse PE with back 
+   //Addts request is pending on one AC, while APSD requested on another which
+   //needs a reassoc. Will buffer a request if Addts is pending on any AC,
+   //which will safegaurd the above scenario, & also won't confuse PE with back
    //to back Addts or Addts followed by Reassoc
    if(sme_QosIsRspPending(sessionId, ac))
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
                 "%s: %d: buffering the modify request for flow %d in state %d "
                 "since another request is pending",
-                __func__, __LINE__, 
+                __func__, __LINE__,
                 QosFlowID, pACInfo->curr_state );
       bufferCommand = VOS_TRUE;
    }
@@ -1980,10 +1980,10 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
 
       if( eHAL_STATUS_PMC_PENDING == hstatus )
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
                    "%s: %d: buffering the modify request for flow %d in state %d, "
                    "waiting for full power",
-                   __func__, __LINE__, 
+                   __func__, __LINE__,
                    QosFlowID, pACInfo->curr_state );
          bufferCommand = VOS_TRUE;
       }
@@ -1999,7 +1999,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
       hstatus = sme_QosBufferCmd(&cmd, buffered_cmd);
       if(!HAL_STATUS_SUCCESS(hstatus))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: couldn't buffer the modify request in state = %d",
                    __func__, __LINE__,
                    pACInfo->curr_state );
@@ -2008,7 +2008,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
          pSession->readyForPowerSave = VOS_TRUE;
          return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP;
       }
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Buffered modify request for flow = %d",
                 __func__, __LINE__,
                 QosFlowID);
@@ -2045,7 +2045,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
       pNewEntry->QoSInfo = *pQoSInfo;
       //update the entry from Flow List which needed to be modified
       flow_info->reason = SME_QOS_REASON_MODIFY;
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: On session %d creating modified "
                 "entry at %p with flowID %d",
                 __func__, __LINE__,
@@ -2054,7 +2054,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
       csrLLInsertTail(&sme_QosCb.flow_list, &pNewEntry->link, VOS_TRUE);
       //update TSPEC with the new param set
       hstatus = sme_QosUpdateParams(sessionId,
-                                    ac, pNewEntry->tspec_mask, 
+                                    ac, pNewEntry->tspec_mask,
                                     &Aggr_Tspec_Info);
       if(HAL_STATUS_SUCCESS(hstatus))
       {
@@ -2063,7 +2063,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
          status = sme_QosSetup(pMac, sessionId,
                                &pACInfo->requested_QoSInfo[pNewEntry->tspec_mask -1],
                                ac);
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                    "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON "
                    "sme_QosSetup returned with status %d",
                    __func__, __LINE__,
@@ -2074,7 +2074,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
             // so vote powersave back on
             pSession->readyForPowerSave = VOS_TRUE;
          }
-         if(SME_QOS_STATUS_SETUP_REQ_PENDING_RSP == status) 
+         if(SME_QOS_STATUS_SETUP_REQ_PENDING_RSP == status)
          {
             new_state = SME_QOS_REQUESTED;
             status = SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP;
@@ -2098,7 +2098,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
             }
             if(SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP != status)
             {
-               pACInfo->curr_QoSInfo[pNewEntry->tspec_mask -1] = 
+               pACInfo->curr_QoSInfo[pNewEntry->tspec_mask -1] =
                   pACInfo->requested_QoSInfo[pNewEntry->tspec_mask -1];
                if(SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY == status)
                {
@@ -2107,11 +2107,11 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
                   search_key.key.ac_type = ac;
                   search_key.index = SME_QOS_SEARCH_KEY_INDEX_2;
                   search_key.sessionId = sessionId;
-                  hstatus = sme_QosFindAllInFlowList(pMac, search_key, 
+                  hstatus = sme_QosFindAllInFlowList(pMac, search_key,
                                                      sme_QosModificationNotifyFnp);
                   if(!HAL_STATUS_SUCCESS(hstatus))
                   {
-                     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+                     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                                "%s: %d: couldn't notify other "
                                "entries on this AC =%d",
                                __func__, __LINE__, ac);
@@ -2124,17 +2124,17 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
             }
             if(buffered_cmd)
             {
-               flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+               flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                                       &pACInfo->curr_QoSInfo[pNewEntry->tspec_mask -1],
                                       status,
                                       flow_info->QosFlowID);
             }
-            
+
          }
          else
          {
             // unexpected status returned by sme_QosSetup()
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: On session %d unexpected status %d "
                       "returned by sme_QosSetup",
                       __func__, __LINE__,
@@ -2145,7 +2145,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
       else
       {
          //err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: sme_QosUpdateParams() failed",
                    __func__, __LINE__);
          // unable to service the request
@@ -2157,7 +2157,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
          to move to requested state. But make sure to set the previous state
          as requested state
       */
-      if(!(pACInfo->reassoc_pending && 
+      if(!(pACInfo->reassoc_pending &&
            (SME_QOS_HANDOFF == pACInfo->curr_state)))
       {
          sme_QosStateTransition(sessionId, ac, new_state);
@@ -2169,7 +2169,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
       break;
    case SME_QOS_HANDOFF:
    case SME_QOS_REQUESTED:
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
                 "%s: %d: Buffering modify request for flow %d in state = %d",
                 __func__, __LINE__,
                 QosFlowID, pACInfo->curr_state );
@@ -2182,7 +2182,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
       hstatus = sme_QosBufferCmd(&cmd, buffered_cmd);
       if(!HAL_STATUS_SUCCESS(hstatus))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: couldn't buffer the modify request in state = %d",
                    __func__, __LINE__,
                    pACInfo->curr_state );
@@ -2197,7 +2197,7 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
    case SME_QOS_INIT:
    case SME_QOS_LINK_UP:
    default:
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: modify requested in unexpected state = %d",
                 __func__, __LINE__,
                 pACInfo->curr_state);
@@ -2207,27 +2207,27 @@ sme_QosStatusType sme_QosInternalModifyReq(tpAniSirGlobal pMac,
       break;
    }
    if((SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP == status) ||
-      (SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_APSD_SET_ALREADY == status)) 
+      (SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_APSD_SET_ALREADY == status))
    {
       (void)sme_QosProcessBufferedCmd(sessionId);
    }
    return status;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosInternalReleaseReq() - The SME QoS internal function to request 
-  for releasing a QoS flow running on a particular AC. 
-  
+  \brief sme_QosInternalReleaseReq() - The SME QoS internal function to request
+  for releasing a QoS flow running on a particular AC.
+
   \param pMac - Pointer to the global MAC parameter structure.
-  \param QosFlowID - Identification per flow running on each AC generated by SME 
-                     It is only meaningful if the QoS setup for the flow is 
+  \param QosFlowID - Identification per flow running on each AC generated by SME
+                     It is only meaningful if the QoS setup for the flow is
                      successful
-  
+
   \return eHAL_STATUS_SUCCESS - Release is successful.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
-sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac, 
+sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
                                             v_U32_t QosFlowID,
                                             v_BOOL_t buffered_cmd)
 {
@@ -2251,7 +2251,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
    v_BOOL_t uplinkFlowsPresent = VOS_FALSE;
    v_BOOL_t downlinkFlowsPresent = VOS_FALSE;
    tListElem *pResult= NULL;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked for flow %d",
              __func__, __LINE__,
              QosFlowID);
@@ -2263,11 +2263,11 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
    search_key.sessionId = SME_QOS_SEARCH_SESSION_ID_ANY;
    //go through the link list to find out the details on the flow
    pEntry = sme_QosFindInFlowList(search_key);
-   
+
    if(!pEntry)
    {
       //Err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: no match found for flowID = %d",
                 __func__, __LINE__,
                 QosFlowID);
@@ -2284,16 +2284,16 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
    // assume we won't have to (re)buffer the command
    bufferCommand = VOS_FALSE;
    //check to consider the following flowing scenario
-   //Addts request is pending on one AC, while APSD requested on another which 
-   //needs a reassoc. Will buffer a request if Addts is pending on any AC, 
-   //which will safegaurd the above scenario, & also won't confuse PE with back 
+   //Addts request is pending on one AC, while APSD requested on another which
+   //needs a reassoc. Will buffer a request if Addts is pending on any AC,
+   //which will safegaurd the above scenario, & also won't confuse PE with back
    //to back Addts or Addts followed by Reassoc
    if(sme_QosIsRspPending(sessionId, ac))
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
                 "%s: %d: buffering the release request for flow %d in state %d "
                 "since another request is pending",
-                __func__, __LINE__, 
+                __func__, __LINE__,
                 QosFlowID, pACInfo->curr_state );
       bufferCommand = VOS_TRUE;
    }
@@ -2315,10 +2315,10 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
 
       if( eHAL_STATUS_PMC_PENDING == hstatus )
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
                    "%s: %d: buffering the release request for flow %d in state %d, "
                    "waiting for full power",
-                   __func__, __LINE__, 
+                   __func__, __LINE__,
                    QosFlowID, pACInfo->curr_state );
          bufferCommand = VOS_TRUE;
       }
@@ -2333,7 +2333,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
       hstatus = sme_QosBufferCmd(&cmd, buffered_cmd);
       if(!HAL_STATUS_SUCCESS(hstatus))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: couldn't buffer the release request in state = %d",
                    __func__, __LINE__,
                    pACInfo->curr_state );
@@ -2342,7 +2342,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
          pSession->readyForPowerSave = VOS_TRUE;
          return SME_QOS_STATUS_RELEASE_FAILURE_RSP;
       }
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Buffered release request for flow = %d",
                 __func__, __LINE__,
                 QosFlowID);
@@ -2352,29 +2352,29 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
    switch(pACInfo->curr_state)
    {
    case SME_QOS_QOS_ON:
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
                 "%s: %d: tspec_mask_status = %d for AC = %d with "
                 "entry tspec_mask = %d",
-                __func__, __LINE__, 
+                __func__, __LINE__,
                 pACInfo->tspec_mask_status, ac, flow_info->tspec_mask);
 
       //check if multiple flows running on the ac
       if(pACInfo->num_flows[flow_info->tspec_mask - 1] > 1)
       {
-         //don't want to include the flow in the new TSPEC on which release 
+         //don't want to include the flow in the new TSPEC on which release
          //is requested
          flow_info->reason = SME_QOS_REASON_RELEASE;
 
          /* Check if the flow being released is for bi-diretional.
-          * Following flows may present in the system. 
+          * Following flows may present in the system.
           * a) bi-directional flows
           * b) uplink flows
-          * c) downlink flows. 
-          * If the flow being released is for bidirectional, splitting of existing 
-          * streams into two tspec indices is required in case ff (b), (c) are present 
+          * c) downlink flows.
+          * If the flow being released is for bidirectional, splitting of existing
+          * streams into two tspec indices is required in case ff (b), (c) are present
           * and not (a).
-          * In case if split occurs, all upstreams are aggregated into tspec index 0, 
-          * downstreams are aggregaed into tspec index 1 and two tspec requests for 
+          * In case if split occurs, all upstreams are aggregated into tspec index 0,
+          * downstreams are aggregaed into tspec index 1 and two tspec requests for
           * (aggregated) upstream(s) followed by (aggregated) downstream(s) is sent
           * to AP. */
          if(flow_info->QoSInfo.ts_info.direction == SME_QOS_WMM_TS_DIR_BOTH)
@@ -2430,7 +2430,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
                          sessionId, ac, pACInfo->curr_state);
 
                // Buffer the (aggregated) tspec request for downstream flows.
-               // Please note that the (aggregated) tspec for upstream flows is sent 
+               // Please note that the (aggregated) tspec for upstream flows is sent
                // out by the susequent logic.
                cmd.command = SME_QOS_RESEND_REQ;
                cmd.pMac = pMac;
@@ -2460,7 +2460,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
          }
 
          /* In case of splitting of existing streams,
-          * tspec_mask will be pointing to tspec index 0 and 
+          * tspec_mask will be pointing to tspec index 0 and
           * aggregated tspec for upstream(s) is sent out here. */
          hstatus = sme_QosUpdateParams(sessionId,
                                        ac, flow_info->tspec_mask,
@@ -2471,7 +2471,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
             //if ACM, send out a new ADDTS
             status = sme_QosSetup(pMac, sessionId,
                                   &pACInfo->requested_QoSInfo[flow_info->tspec_mask - 1], ac);
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                       "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON "
                       "sme_QosSetup returned with status %d",
                       __func__, __LINE__,
@@ -2482,7 +2482,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
                // so vote powersave back on
                pSession->readyForPowerSave = VOS_TRUE;
             }
-            if(SME_QOS_STATUS_SETUP_REQ_PENDING_RSP == status) 
+            if(SME_QOS_STATUS_SETUP_REQ_PENDING_RSP == status)
             {
                new_state = SME_QOS_REQUESTED;
                status = SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP;
@@ -2496,7 +2496,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
                pACInfo->curr_QoSInfo[flow_info->tspec_mask - 1] =
                   pACInfo->requested_QoSInfo[flow_info->tspec_mask - 1];
                //delete the entry from Flow List
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: Deleting entry at %p with flowID %d",
                          __func__, __LINE__,
                          flow_info, QosFlowID);
@@ -2508,11 +2508,11 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
                   search_key.key.ac_type = ac;
                   search_key.index = SME_QOS_SEARCH_KEY_INDEX_2;
                   search_key.sessionId = sessionId;
-                  hstatus = sme_QosFindAllInFlowList(pMac, search_key, 
+                  hstatus = sme_QosFindAllInFlowList(pMac, search_key,
                                                      sme_QosSetupFnp);
                   if(!HAL_STATUS_SUCCESS(hstatus))
                   {
-                     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+                     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                                "%s: %d: couldn't notify other "
                                "entries on this AC =%d",
                                __func__, __LINE__, ac);
@@ -2521,7 +2521,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
                status = SME_QOS_STATUS_RELEASE_SUCCESS_RSP;
                if(buffered_cmd)
                {
-                  flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+                  flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                                          &pACInfo->curr_QoSInfo[flow_info->tspec_mask - 1],
                                          status,
                                          flow_info->QosFlowID);
@@ -2530,7 +2530,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
             else
             {
                // unexpected status returned by sme_QosSetup()
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                          "%s: %d: On session %d unexpected status %d "
                          "returned by sme_QosSetup",
                          __func__, __LINE__,
@@ -2540,7 +2540,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
                pACInfo->curr_QoSInfo[flow_info->tspec_mask - 1] =
                   pACInfo->requested_QoSInfo[flow_info->tspec_mask - 1];
                //delete the entry from Flow List
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: On session %d deleting entry at "
                          "%p with flowID %d",
                          __func__, __LINE__,
@@ -2549,7 +2549,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
                pDeletedFlow = flow_info;
                if(buffered_cmd)
                {
-                  flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+                  flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                                          &pACInfo->curr_QoSInfo[flow_info->tspec_mask - 1],
                                          status,
                                          flow_info->QosFlowID);
@@ -2559,7 +2559,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
          else
          {
             //err msg
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: sme_QosUpdateParams() failed",
                       __func__, __LINE__);
             // unable to service the request
@@ -2568,7 +2568,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
             new_state = SME_QOS_LINK_UP;
             if(buffered_cmd)
             {
-               flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+               flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                                       &pACInfo->curr_QoSInfo[flow_info->tspec_mask - 1],
                                       status,
                                       flow_info->QosFlowID);
@@ -2599,7 +2599,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
                pSession->apsdMask &= ~(1 << (SME_QOS_EDCA_AC_VO - ac));
                //Also update modifyProfileFields.uapsd_mask in CSR for consistency
                csrGetModifyProfileFields(pMac, flow_info->sessionId, &modifyProfileFields);
-               modifyProfileFields.uapsd_mask = pSession->apsdMask; 
+               modifyProfileFields.uapsd_mask = pSession->apsdMask;
                csrSetModifyProfileFields(pMac, flow_info->sessionId, &modifyProfileFields);
                if(!pSession->apsdMask)
                {
@@ -2681,7 +2681,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
             if(!HAL_STATUS_SUCCESS(hstatus))
             {
                //err msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                          "%s: %d: Reassoc failed",
                          __func__, __LINE__);
                status = SME_QOS_STATUS_RELEASE_FAILURE_RSP;
@@ -2698,7 +2698,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
          }
          else
          {
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                       "%s: %d: nothing to do for AC = %d",
                       __func__, __LINE__, ac);
             // we won't be waiting for a response from the AP
@@ -2732,10 +2732,10 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
          }
 
          if(((SME_QOS_TSPEC_MASK_BIT_1_2_SET & ~flow_info->tspec_mask) > 0) &&
-            ((SME_QOS_TSPEC_MASK_BIT_1_2_SET & ~flow_info->tspec_mask) <= 
+            ((SME_QOS_TSPEC_MASK_BIT_1_2_SET & ~flow_info->tspec_mask) <=
                 SME_QOS_TSPEC_INDEX_MAX))
          {
-            if(pACInfo->num_flows[(SME_QOS_TSPEC_MASK_BIT_1_2_SET & 
+            if(pACInfo->num_flows[(SME_QOS_TSPEC_MASK_BIT_1_2_SET &
                                     ~flow_info->tspec_mask) - 1] > 0)
             {
                new_state = SME_QOS_QOS_ON;
@@ -2743,11 +2743,11 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
             else
             {
                new_state = SME_QOS_LINK_UP;
-            }         
+            }
          }
          else
          {
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                       "%s: %d: Exceeded the array bounds of pACInfo->num_flows",
                       __func__, __LINE__);
             VOS_ASSERT (0);
@@ -2756,14 +2756,14 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
 
          if(VOS_FALSE == deltsIssued)
          {
-            vos_mem_zero(&pACInfo->curr_QoSInfo[flow_info->tspec_mask - 1], 
+            vos_mem_zero(&pACInfo->curr_QoSInfo[flow_info->tspec_mask - 1],
                       sizeof(sme_QosWmmTspecInfo));
          }
-         vos_mem_zero(&pACInfo->requested_QoSInfo[flow_info->tspec_mask - 1], 
+         vos_mem_zero(&pACInfo->requested_QoSInfo[flow_info->tspec_mask - 1],
                       sizeof(sme_QosWmmTspecInfo));
          pACInfo->num_flows[flow_info->tspec_mask - 1]--;
          //delete the entry from Flow List
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                    "%s: %d: On session %d deleting entry at %p with flowID %d",
                    __func__, __LINE__,
                    sessionId, flow_info, QosFlowID);
@@ -2794,7 +2794,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
       hstatus = sme_QosBufferCmd(&cmd, buffered_cmd);
       if(!HAL_STATUS_SUCCESS(hstatus))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: couldn't buffer the release request in state = %d",
                    __func__, __LINE__,
                    pACInfo->curr_state );
@@ -2810,7 +2810,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
    case SME_QOS_LINK_UP:
    default:
       //print error msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: release request in unexpected state = %d",
                 __func__, __LINE__,
                 pACInfo->curr_state );
@@ -2826,7 +2826,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
    {
       vos_mem_free(pDeletedFlow);
    }
-   if((SME_QOS_STATUS_RELEASE_SUCCESS_RSP == status)) 
+   if((SME_QOS_STATUS_RELEASE_SUCCESS_RSP == status))
    {
       (void)sme_QosProcessBufferedCmd(sessionId);
    }
@@ -2834,17 +2834,17 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosSetup() - The internal qos setup function which has the 
+  \brief sme_QosSetup() - The internal qos setup function which has the
   intelligence if the request is NOP, or for APSD and/or need to send out ADDTS.
   It also does the sanity check for QAP, AP supports APSD etc.
-  \param pMac - Pointer to the global MAC parameter structure.   
+  \param pMac - Pointer to the global MAC parameter structure.
   \param sessionId - Session upon which setup is being performed
-  \param pTspec_Info - Pointer to sme_QosWmmTspecInfo which contains the WMM 
+  \param pTspec_Info - Pointer to sme_QosWmmTspecInfo which contains the WMM
                        TSPEC related info as defined above
   \param ac - Enumeration of the various EDCA Access Categories.
-  
+
   \return SME_QOS_STATUS_SETUP_SUCCESS_RSP if the setup is successful
-  The logic used in the code might be confusing. Trying to cover all the cases 
+  The logic used in the code might be confusing. Trying to cover all the cases
   here.
   AP supports  App wants   ACM = 1  Already set APSD   Result
   |    0     |    0     |     0   |       0          |  NO ACM NO APSD
@@ -2863,13 +2863,13 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac,
   |    1     |    1     |     0   |       1          |  NOP: APSD SET ALREADY
   |    1     |    1     |     1   |       0          |  ADDTS
   |    1     |    1     |     1   |       1          |  ADDTS
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
                                v_U8_t sessionId,
-                               sme_QosWmmTspecInfo *pTspec_Info, 
+                               sme_QosWmmTspecInfo *pTspec_Info,
                                sme_QosEdcaAcType ac)
 {
    sme_QosSessionInfo *pSession;
@@ -2880,7 +2880,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
    eHalStatus hstatus;
    if( !CSR_IS_SESSION_VALID( pMac, sessionId ) )
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Session Id %d is invalid",
                 __func__, __LINE__,
                 sessionId);
@@ -2889,7 +2889,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
    pSession = &sme_QosCb.sessionInfo[sessionId];
    if( !pSession->sessionActive )
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Session %d is inactive",
                 __func__, __LINE__,
                 sessionId);
@@ -2897,7 +2897,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
    }
    if(!pSession->assocInfo.pBssDesc)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Session %d has an Invalid BSS Descriptor",
                 __func__, __LINE__,
                 sessionId);
@@ -2919,7 +2919,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
 
    if( !CSR_IS_QOS_BSS(pIes) )
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: On session %d AP doesn't support QoS",
                 __func__, __LINE__,
                 sessionId);
@@ -2940,11 +2940,11 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
          sme_QosIsACM(pMac, pSession->assocInfo.pBssDesc, ac, NULL))
       {
          // ACM is enabled for this AC so we must send an AddTS
-         if(pTspec_Info->ts_info.psb && 
+         if(pTspec_Info->ts_info.psb &&
             !(pMac->psOffloadEnabled && pMac->pmcOffloadInfo.pmc[sessionId].UapsdEnabled)
              && (!pMac->pmc.uapsdEnabled ))
          {
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                       "%s: %d: Request is looking for APSD but PMC doesn't "
                       "have support for APSD",
                       __func__, __LINE__);
@@ -2974,7 +2974,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
                                    pTspec_Info, ac, 0);
          if(!HAL_STATUS_SUCCESS(hstatus))
          {
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: sme_QosAddTsReq() failed",
                       __func__, __LINE__);
             break;
@@ -2991,15 +2991,15 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
       if(0 == pTspec_Info->ts_info.psb)
       {
          //no, we don't need APSD
-         //but check the case, if the setup is called as a result of a release 
+         //but check the case, if the setup is called as a result of a release
          // or modify which boils down to the fact that APSD was set on this AC
-         // but no longer needed - so we need a reassoc for the above case to 
+         // but no longer needed - so we need a reassoc for the above case to
          // let the AP know
          if(pSession->apsdMask & (1 << (SME_QOS_EDCA_AC_VO - ac)))
          {
             // APSD was formerly enabled on this AC but is no longer required
             // so we must reassociate
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                       "%s: %d: On session %d reassoc needed "
                       "to disable APSD on AC %d",
                       __func__, __LINE__,
@@ -3012,7 +3012,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
             if(!HAL_STATUS_SUCCESS(hstatus))
             {
                //err msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                          "%s: %d: Unable to request reassociation",
                          __func__, __LINE__);
                break;
@@ -3032,7 +3032,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
          {
             // we don't need APSD on this AC
             // and we don't currently have APSD on this AC
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                       "%s: %d: Request is not looking for APSD & Admission "
                       "Control isn't mandatory for the AC",
                       __func__, __LINE__);
@@ -3045,7 +3045,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
               !(pIes->WMMInfoAp.uapsd))
       {
          // application is looking for APSD but AP doesn't support it
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: On session %d AP doesn't support APSD",
                    __func__, __LINE__,
                    sessionId);
@@ -3056,7 +3056,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
          // application is looking for APSD
          // and it is already enabled on this AC
          status = SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY;
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                    "%s: %d: Request is looking for APSD and it is already "
                    "set for the AC",
                    __func__, __LINE__);
@@ -3070,13 +3070,13 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
          if(pMac->pmc.uapsdEnabled || (pMac->psOffloadEnabled
             && pMac->pmcOffloadInfo.pmc[sessionId].UapsdEnabled))
          {
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                       "%s: %d: On session %d reassoc needed "
                       "to enable APSD on AC %d",
                       __func__, __LINE__,
                       sessionId, ac);
             //reassoc logic
-            // update the UAPSD mask to include the new 
+            // update the UAPSD mask to include the new
             // AC on which APSD is requested
             csrGetModifyProfileFields(pMac, sessionId, &modifyProfileFields);
             modifyProfileFields.uapsd_mask |= pSession->apsdMask;
@@ -3086,7 +3086,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
             if(!HAL_STATUS_SUCCESS(hstatus))
             {
                //err msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                          "%s: %d: Unable to request reassociation",
                          __func__, __LINE__);
                break;
@@ -3105,7 +3105,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
          else
          {
             //err msg: no support for APSD from PMC
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: no support for APSD or BMPS from PMC",
                       __func__, __LINE__);
          }
@@ -3117,15 +3117,15 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac,
 }
 
 #if defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
-/* This is a dummy function now. But the purpose of me adding this was to 
- * delay the TSPEC processing till SET_KEY completes. This function can be 
- * used to do any SME_QOS processing after the SET_KEY. As of now, it is 
- * not required as we are ok with tspec getting programmed before set_key 
+/* This is a dummy function now. But the purpose of me adding this was to
+ * delay the TSPEC processing till SET_KEY completes. This function can be
+ * used to do any SME_QOS processing after the SET_KEY. As of now, it is
+ * not required as we are ok with tspec getting programmed before set_key
  * as the roam timings are measured without tspec in reassoc!
  */
 eHalStatus sme_QosProcessSetKeySuccessInd(tpAniSirGlobal pMac, v_U8_t sessionId, void * pEvent_info)
 {
-    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN, 
+    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
             "########### Set Key Complete #############");
     (void)sme_QosProcessBufferedCmd(sessionId);
     return eHAL_STATUS_SUCCESS;
@@ -3136,13 +3136,13 @@ eHalStatus sme_QosProcessSetKeySuccessInd(tpAniSirGlobal pMac, v_U8_t sessionId,
 /*--------------------------------------------------------------------------
   \brief sme_QosCCXSaveTspecResponse() - This function saves the TSPEC
          parameters that came along in the TSPEC IE in the reassoc response
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
-  \param sessionId - SME session ID 
+  \param sessionId - SME session ID
   \param pTspec - Pointer to the TSPEC IE from the reassoc rsp
   \param ac - Access Category for which this TSPEC rsp is received
   \param tspecIndex - flow/direction
-  
+
   \return eHAL_STATUS_SUCCESS - Release is successful.
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosCCXSaveTspecResponse(tpAniSirGlobal pMac, v_U8_t sessionId, tDot11fIEWMMTSPEC *pTspec, v_U8_t ac, v_U8_t tspecIndex)
@@ -3160,8 +3160,8 @@ eHalStatus sme_QosCCXSaveTspecResponse(tpAniSirGlobal pMac, v_U8_t sessionId, tD
     pAddtsRsp->rsp.dialogToken = 0;
     pAddtsRsp->rsp.status = eSIR_SUCCESS;
     pAddtsRsp->rsp.wmeTspecPresent = pTspec->present;
-    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
-            "%s: Copy Tspec to local data structure ac=%d, tspecIdx=%d", 
+    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
+            "%s: Copy Tspec to local data structure ac=%d, tspecIdx=%d",
             __func__, ac, tspecIndex);
 
     if (pAddtsRsp->rsp.wmeTspecPresent)
@@ -3175,16 +3175,16 @@ eHalStatus sme_QosCCXSaveTspecResponse(tpAniSirGlobal pMac, v_U8_t sessionId, tD
 
 /*--------------------------------------------------------------------------
   \brief sme_QosCCXProcessReassocTspecRsp() - This function processes the
-         WMM TSPEC IE in the reassoc response. Reassoc triggered as part of 
-         CCX roaming to another CCX capable AP. If the TSPEC was added before 
+         WMM TSPEC IE in the reassoc response. Reassoc triggered as part of
+         CCX roaming to another CCX capable AP. If the TSPEC was added before
          reassoc, as part of Call Admission Control, the reasso req from the
          STA would carry the TSPEC parameters which were already negotiated
          with the older AP.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
-  \param sessionId - SME session ID 
+  \param sessionId - SME session ID
   \param pEven_info - Pointer to the smeJoinRsp structure
-  
+
   \return eHAL_STATUS_SUCCESS - Release is successful.
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosCCXProcessReassocTspecRsp(tpAniSirGlobal pMac, v_U8_t sessionId, void* pEvent_info)
@@ -3201,13 +3201,13 @@ eHalStatus sme_QosCCXProcessReassocTspecRsp(tpAniSirGlobal pMac, v_U8_t sessionI
 
     pSession = &sme_QosCb.sessionInfo[sessionId];
 
-    // Get the TSPEC IEs which came along with the reassoc response 
+    // Get the TSPEC IEs which came along with the reassoc response
     // from the pbFrames pointer
     pTspecIE = (tDot11fIEWMMTSPEC *)(pCsrConnectedInfo->pbFrames + pCsrConnectedInfo->nBeaconLength +
         pCsrConnectedInfo->nAssocReqLength + pCsrConnectedInfo->nAssocRspLength + pCsrConnectedInfo->nRICRspLength);
 
     // Get the number of tspecs Ies in the frame, the min length
-    // should be atleast equal to the one TSPEC IE 
+    // should be atleast equal to the one TSPEC IE
     tspecIeLen = pCsrConnectedInfo->nTspecIeLength;
     if (tspecIeLen < sizeof(tDot11fIEWMMTSPEC)) {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
@@ -3231,11 +3231,11 @@ eHalStatus sme_QosCCXProcessReassocTspecRsp(tpAniSirGlobal pMac, v_U8_t sessionI
 
             for (tspec_flow_index = 0; tspec_flow_index < SME_QOS_TSPEC_INDEX_MAX; tspec_flow_index++) {
                 if (tspec_mask_status & (1 << tspec_flow_index)) {
-                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN, 
+                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
                 FL("Found Tspec entry flow = %d AC = %d"),tspec_flow_index, ac);
                     sme_QosCCXSaveTspecResponse(pMac, sessionId, pTspecIE, ac, tspec_flow_index);
                 } else {
-                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN, 
+                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
                 FL("Not found Tspec entry flow = %d AC = %d"),tspec_flow_index, ac);
                 }
             }
@@ -3250,14 +3250,14 @@ eHalStatus sme_QosCCXProcessReassocTspecRsp(tpAniSirGlobal pMac, v_U8_t sessionI
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosCopyTspecInfo() - This function copies the existing TSPEC 
+  \brief sme_QosCopyTspecInfo() - This function copies the existing TSPEC
          parameters from the source structure to the destination structure.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
   \param pTspec_Info - source structure
   \param pTspec - destination structure
-  
-  \return void 
+
+  \return void
   --------------------------------------------------------------------------*/
 static void sme_QosCopyTspecInfo(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pTspec_Info, tSirMacTspecIE* pTspec)
 {
@@ -3308,11 +3308,11 @@ static void sme_QosCopyTspecInfo(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pTspe
          when try to create reassoc request message to PE - csrSendSmeReassocReqMsg
          This functions get the existing tspec parameters to be included
          in the reassoc request.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
-  \param sessionId - SME session ID 
+  \param sessionId - SME session ID
   \param pTspecInfo - Pointer to the structure to carry back the TSPEC parameters
-  
+
   \return v_U8_t - number of existing negotiated TSPECs
   --------------------------------------------------------------------------*/
 v_U8_t sme_QosCCxRetrieveTspecInfo(tpAniSirGlobal pMac, v_U8_t sessionId, tTspecInfo *pTspecInfo)
@@ -3326,7 +3326,7 @@ v_U8_t sme_QosCCxRetrieveTspecInfo(tpAniSirGlobal pMac, v_U8_t sessionId, tTspec
 
     //TODO: Check if TSPEC has already been established, if not return
 
-    pSession = &sme_QosCb.sessionInfo[sessionId];    
+    pSession = &sme_QosCb.sessionInfo[sessionId];
 
     for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) {
         volatile v_U8_t tspec_index = 0;
@@ -3412,17 +3412,17 @@ eHalStatus sme_QosCreateTspecRICIE(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pTs
     ricIE.TSPEC.access_policy = SME_QOS_ACCESS_POLICY_EDCA;
 
     *pRICIdentifier = ricIE.RICData.Identifier;
-    
+
     nStatus = dot11fPackIeRICDataDesc(pMac, &ricIE, pRICBuffer, sizeof(ricIE), pRICLength);
     if (DOT11F_FAILED(nStatus))
     {
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
-                FL("Packing of RIC Data of length %d failed with status %d"), 
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+                FL("Packing of RIC Data of length %d failed with status %d"),
                                         *pRICLength, nStatus);
     }
 #else // WMM TSPEC
-    /*As per WMM_AC_testplan_v0.39 Minimum Service Interval, Maximum Service 
-      Interval, Service Start Time, Suspension Interval and Delay Bound are 
+    /*As per WMM_AC_testplan_v0.39 Minimum Service Interval, Maximum Service
+      Interval, Service Start Time, Suspension Interval and Delay Bound are
       all intended for HCCA operation and therefore must be set to zero*/
     ricIE.WMMTSPEC.present = 1;
     ricIE.WMMTSPEC.version = 1;
@@ -3455,12 +3455,12 @@ eHalStatus sme_QosCreateTspecRICIE(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pTs
     ricIE.WMMTSPEC.user_priority = pTspec_Info->ts_info.up;
     ricIE.WMMTSPEC.access_policy = SME_QOS_ACCESS_POLICY_EDCA;
 
-    
+
     nStatus = dot11fPackIeRICDataDesc(pMac, &ricIE, pRICBuffer, sizeof(ricIE), pRICLength);
     if (DOT11F_FAILED(nStatus))
     {
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
-                FL("Packing of RIC Data of length %d failed with status %d"), 
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+                FL("Packing of RIC Data of length %d failed with status %d"),
                                         *pRICLength, nStatus);
     }
 #endif /* 80211_TSPEC */
@@ -3493,7 +3493,7 @@ eHalStatus sme_QosProcessFTReassocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, v
             if ((pACInfo->ricIdentifier[tspec_flow_index] && !pACInfo->tspec_pending) ||
                     (pACInfo->tspec_mask_status & (1<<tspec_flow_index)))
             {
-                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                         FL("Copying the currentQos to requestedQos for AC=%d, flow=%d"),
                         ac, tspec_flow_index );
 
@@ -3503,9 +3503,9 @@ eHalStatus sme_QosProcessFTReassocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, v
             }
         }
 
-        // Only if the tspec is required, transition the state to 
+        // Only if the tspec is required, transition the state to
         // SME_QOS_REQUESTED for this AC
-        if (qos_requested) 
+        if (qos_requested)
         {
             switch(pACInfo->curr_state)
             {
@@ -3513,7 +3513,7 @@ eHalStatus sme_QosProcessFTReassocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, v
                     sme_QosStateTransition(sessionId, ac, SME_QOS_REQUESTED);
                     break;
                 default:
-                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                             FL("FT Reassoc req event in unexpected state %d"), pACInfo->curr_state);
                     VOS_ASSERT(0);
             }
@@ -3598,7 +3598,7 @@ eHalStatus sme_QosFTAggrQosReq( tpAniSirGlobal pMac, v_U8_t sessionId )
             VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                     FL("ac=%d, tspec_mask_staus=%x, tspec_index=%d"),
                     i, pSession->ac_info[i].tspec_mask_status, j);
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                     FL("direction = %d"), pSession->ac_info[i].addTsRsp[j].rsp.tspec.tsinfo.traffic.direction);
             // Check if any flow is active on this AC
             if ((pSession->ac_info[i].tspec_mask_status) & (1 << j))
@@ -3607,7 +3607,7 @@ eHalStatus sme_QosFTAggrQosReq( tpAniSirGlobal pMac, v_U8_t sessionId )
                 if ((direction == SME_QOS_WMM_TS_DIR_UPLINK) ||
                         (direction == SME_QOS_WMM_TS_DIR_BOTH))
                 {
-                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN, 
+                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
                             FL("Found tspec entry AC=%d, flow=%d, direction = %d"), i, j, direction);
                     pMsg->aggrInfo.aggrAddTsInfo[i].dialogToken =
                         sme_QosAssignDialogToken();
@@ -3630,7 +3630,7 @@ eHalStatus sme_QosFTAggrQosReq( tpAniSirGlobal pMac, v_U8_t sessionId )
                         pSession->ac_info[i].addTsRsp[j].rsp.wsmTspecPresent;
                     pMsg->aggrInfo.tspecIdx |= ( 1 << i );
 
-                    // Mark the index for this AC as pending for response, which would be 
+                    // Mark the index for this AC as pending for response, which would be
                     // used to validate the AddTS response from HAL->PE->SME
                     pSession->ac_info[i].tspec_pending = (1<<j);
                 }
@@ -3638,7 +3638,7 @@ eHalStatus sme_QosFTAggrQosReq( tpAniSirGlobal pMac, v_U8_t sessionId )
         }
     }
 
-    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
             "Sending aggregated message to HAL 0x%x", pMsg->aggrInfo.tspecIdx);
 
     if(HAL_STATUS_SUCCESS(palSendMBMessage(pMac->hHdd, pMsg)))
@@ -3716,14 +3716,14 @@ eHalStatus sme_QosProcessAggrQosRsp(tpAniSirGlobal pMac, void *pMsgBuf)
     int i, j = 0;
     tANI_U8 sessionId = pAggrRsp->sessionId;
 
-    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
             FL("Received AGGR_QOS resp from LIM"));
 
     /* Copy over the updated response information for TSPEC of all the ACs */
     for( i = 0; i < SIR_QOS_NUM_AC_MAX; i++ )
     {
         tANI_U8 tspec_mask_status = sme_QosCb.sessionInfo[sessionId].ac_info[i].tspec_mask_status;
-        for( j = 0; j < SME_QOS_TSPEC_INDEX_MAX; j++ ) 
+        for( j = 0; j < SME_QOS_TSPEC_INDEX_MAX; j++ )
         {
             tANI_U8 direction = sme_QosCb.sessionInfo[sessionId].ac_info[i].
                 addTsRsp[j].rsp.tspec.tsinfo.traffic.direction;
@@ -3767,10 +3767,10 @@ eHalStatus sme_QosProcessFTReassocRspEv(tpAniSirGlobal pMac, v_U8_t sessionId, v
     tCsrRoamSession *pCsrSession = CSR_GET_SESSION( pMac, sessionId );
     tCsrRoamConnectedInfo *pCsrConnectedInfo = &pCsrSession->connectedInfo;
     tANI_U32    ricRspLen;
-    /* To silence the KW tool NULL check is added */ 
+    /* To silence the KW tool NULL check is added */
     if(pCsrConnectedInfo == NULL)
     {
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 FL("The connected info pointer is NULL"));
         return eHAL_STATUS_FAILURE;
     }
@@ -3799,7 +3799,7 @@ eHalStatus sme_QosProcessFTReassocRspEv(tpAniSirGlobal pMac, v_U8_t sessionId, v
 
                 if (!ricRspLen)
                 {
-                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                             FL("RIC Response not received for AC %d on TSPEC Index %d, RIC Req Identifier = %d"),
                             ac, tspec_flow_index, pACInfo->ricIdentifier[tspec_flow_index]);
                     VOS_ASSERT(0);
@@ -3813,20 +3813,20 @@ eHalStatus sme_QosProcessFTReassocRspEv(tpAniSirGlobal pMac, v_U8_t sessionId, v
                         {
                             if (pRicDataDesc->RICData.Identifier != pACInfo->ricIdentifier[tspec_flow_index])
                             {
-                                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+                                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                                         FL("RIC response order not same as request sent. Request ID = %d, Response ID = %d"),
                                         pACInfo->ricIdentifier[tspec_flow_index], pRicDataDesc->RICData.Identifier);
                                 VOS_ASSERT(0);
                             }
                             else
                             {
-                                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+                                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                                         FL("Processing RIC Response for AC %d, TSPEC Flow index %d with RIC ID %d "),
                                         ac, tspec_flow_index, pRicDataDesc->RICData.Identifier);
                                 status = sme_QosProcessFTRICResponse(pMac, sessionId, pRicDataDesc, ac, tspec_flow_index);
                                 if (eHAL_STATUS_SUCCESS != status)
                                 {
-                                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+                                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                                             FL("Failed with status %d for AC %d in TSPEC Flow index = %d"),
                                             status, ac, tspec_flow_index);
                                 }
@@ -3843,7 +3843,7 @@ eHalStatus sme_QosProcessFTReassocRspEv(tpAniSirGlobal pMac, v_U8_t sessionId, v
 
     if (ricRspLen)
     {
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 FL("RIC Response still follows despite traversing through all ACs. Remaining len = %d"), ricRspLen);
         VOS_ASSERT(0);
     }
@@ -3860,18 +3860,18 @@ eHalStatus sme_QosProcessFTReassocRspEv(tpAniSirGlobal pMac, v_U8_t sessionId, v
 
 /*--------------------------------------------------------------------------
   \brief sme_QosAddTsReq() - To send down the ADDTS request with TSPEC params
-  to PE 
-  
- 
-  \param pMac - Pointer to the global MAC parameter structure.  
+  to PE
+
+
+  \param pMac - Pointer to the global MAC parameter structure.
   \param sessionId - Session upon which the TSPEC should be added
-  \param pTspec_Info - Pointer to sme_QosWmmTspecInfo which contains the WMM 
+  \param pTspec_Info - Pointer to sme_QosWmmTspecInfo which contains the WMM
                        TSPEC related info as defined above
   \param ac - Enumeration of the various EDCA Access Categories.
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosAddTsReq(tpAniSirGlobal pMac,
                            v_U8_t sessionId,
@@ -3887,7 +3887,7 @@ eHalStatus sme_QosAddTsReq(tpAniSirGlobal pMac,
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
    WLAN_VOS_DIAG_EVENT_DEF(qos, vos_event_wlan_qos_payload_type);
 #endif
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d for AC %d",
              __func__, __LINE__,
              sessionId, ac);
@@ -3905,7 +3905,7 @@ eHalStatus sme_QosAddTsReq(tpAniSirGlobal pMac,
    if (!pMsg)
    {
       //err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: couldn't allocate memory for the msg buffer",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
@@ -3917,8 +3917,8 @@ eHalStatus sme_QosAddTsReq(tpAniSirGlobal pMac,
    pMsg->timeout = 0;
    pMsg->rspReqd = VOS_TRUE;
    pMsg->req.dialogToken = sme_QosAssignDialogToken();
-   /*As per WMM_AC_testplan_v0.39 Minimum Service Interval, Maximum Service 
-     Interval, Service Start Time, Suspension Interval and Delay Bound are 
+   /*As per WMM_AC_testplan_v0.39 Minimum Service Interval, Maximum Service
+     Interval, Service Start Time, Suspension Interval and Delay Bound are
      all intended for HCCA operation and therefore must be set to zero*/
    pMsg->req.tspec.delayBound = 0;
    pMsg->req.tspec.inactInterval = pTspec_Info->inactivity_interval;
@@ -3938,8 +3938,8 @@ eHalStatus sme_QosAddTsReq(tpAniSirGlobal pMac,
    pMsg->req.tspec.svcStartTime = 0;
    pMsg->req.tspec.tsinfo.traffic.direction = pTspec_Info->ts_info.direction;
    //Make sure UAPSD is allowed. BTC may want to disable UAPSD while keep QoS setup
-   if( pTspec_Info->ts_info.psb 
-         && btcIsReadyForUapsd(pMac) 
+   if( pTspec_Info->ts_info.psb
+         && btcIsReadyForUapsd(pMac)
      )
    {
       pMsg->req.tspec.tsinfo.traffic.psb = pTspec_Info->ts_info.psb;
@@ -3958,18 +3958,18 @@ eHalStatus sme_QosAddTsReq(tpAniSirGlobal pMac,
    /*Fill the BSSID pMsg->req.bssId*/
    if (NULL == pSession->assocInfo.pBssDesc)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: BSS descriptor is NULL so we don't send request to PE",
                 __func__, __LINE__);
       vos_mem_free(pMsg);
       return eHAL_STATUS_FAILURE;
    }
-   vos_mem_copy( &pMsg->bssId[ 0 ], 
-                 &pSession->assocInfo.pBssDesc->bssId[ 0 ], 
+   vos_mem_copy( &pMsg->bssId[ 0 ],
+                 &pSession->assocInfo.pBssDesc->bssId[ 0 ],
                  sizeof(tCsrBssid) );
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: up = %d, tid = %d",
-             __func__, __LINE__, 
+             __func__, __LINE__,
              pTspec_Info->ts_info.up,
              pTspec_Info->ts_info.tid);
 #ifdef FEATURE_WLAN_CCX
@@ -3982,11 +3982,11 @@ eHalStatus sme_QosAddTsReq(tpAniSirGlobal pMac,
    if(HAL_STATUS_SUCCESS(palSendMBMessage(pMac->hHdd, pMsg)))
    {
       status = eHAL_STATUS_SUCCESS;
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: sent down a ADDTS req to PE",
                 __func__, __LINE__);
       //event: EVENT_WLAN_QOS
-#ifdef FEATURE_WLAN_DIAG_SUPPORT          
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
       qos.eventId = SME_QOS_DIAG_ADDTS_REQ;
       qos.reasonCode = SME_QOS_DIAG_USER_REQUESTED;
       WLAN_VOS_DIAG_EVENT_REPORT(&qos, EVENT_WLAN_QOS);
@@ -3996,18 +3996,18 @@ eHalStatus sme_QosAddTsReq(tpAniSirGlobal pMac,
 }
 /*--------------------------------------------------------------------------
   \brief sme_QosDelTsReq() - To send down the DELTS request with TSPEC params
-  to PE 
-  
- 
-  \param pMac - Pointer to the global MAC parameter structure.  
+  to PE
+
+
+  \param pMac - Pointer to the global MAC parameter structure.
   \param sessionId - Session from which the TSPEC should be deleted
   \param ac - Enumeration of the various EDCA Access Categories.
   \param tspec_mask - on which tspec per AC, the delts is requested
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosDelTsReq(tpAniSirGlobal pMac,
                            v_U8_t sessionId,
@@ -4022,7 +4022,7 @@ eHalStatus sme_QosDelTsReq(tpAniSirGlobal pMac,
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
    WLAN_VOS_DIAG_EVENT_DEF(qos, vos_event_wlan_qos_payload_type);
 #endif
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d for AC %d",
              __func__, __LINE__,
              sessionId, ac);
@@ -4030,7 +4030,7 @@ eHalStatus sme_QosDelTsReq(tpAniSirGlobal pMac,
    if (!pMsg)
    {
       //err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: couldn't allocate memory for the msg buffer",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
@@ -4071,31 +4071,31 @@ eHalStatus sme_QosDelTsReq(tpAniSirGlobal pMac,
    /*Fill the BSSID pMsg->req.bssId*/
    if (NULL == pSession->assocInfo.pBssDesc)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: BSS descriptor is NULL so we don't send request to PE",
                 __func__, __LINE__);
       vos_mem_free(pMsg);
       return eHAL_STATUS_FAILURE;
    }
-   vos_mem_copy( &pMsg->bssId[ 0 ], 
-                 &pSession->assocInfo.pBssDesc->bssId[ 0 ], 
+   vos_mem_copy( &pMsg->bssId[ 0 ],
+                 &pSession->assocInfo.pBssDesc->bssId[ 0 ],
                  sizeof(tCsrBssid) );
 
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: up = %d, tid = %d",
-             __func__, __LINE__, 
+             __func__, __LINE__,
              pTspecInfo->ts_info.up,
              pTspecInfo->ts_info.tid);
-   vos_mem_zero(&pACInfo->curr_QoSInfo[tspec_mask - 1], 
+   vos_mem_zero(&pACInfo->curr_QoSInfo[tspec_mask - 1],
                 sizeof(sme_QosWmmTspecInfo));
    if(HAL_STATUS_SUCCESS(palSendMBMessage(pMac->hHdd, pMsg)))
    {
       status = eHAL_STATUS_SUCCESS;
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: sme_QosDelTsReq:Test: sent down a DELTS req to PE",
                 __func__, __LINE__);
       //event: EVENT_WLAN_QOS
-#ifdef FEATURE_WLAN_DIAG_SUPPORT          
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
       qos.eventId = SME_QOS_DIAG_DELTS;
       qos.reasonCode = SME_QOS_DIAG_USER_REQUESTED;
       WLAN_VOS_DIAG_EVENT_REPORT(&qos, EVENT_WLAN_QOS);
@@ -4108,15 +4108,15 @@ eHalStatus sme_QosDelTsReq(tpAniSirGlobal pMac,
 
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessAddTsRsp() - Function to process the
-  eWNI_SME_ADDTS_RSP came from PE 
-  
-  \param pMac - Pointer to the global MAC parameter structure.  
-  \param pMsgBuf - Pointer to the msg buffer came from PE.   
-  
+  eWNI_SME_ADDTS_RSP came from PE
+
+  \param pMac - Pointer to the global MAC parameter structure.
+  \param pMsgBuf - Pointer to the msg buffer came from PE.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessAddTsRsp(tpAniSirGlobal pMac, void *pMsgBuf)
 {
@@ -4136,7 +4136,7 @@ eHalStatus sme_QosProcessAddTsRsp(tpAniSirGlobal pMac, void *pMsgBuf)
     pSession = &sme_QosCb.sessionInfo[sessionId];
 
 #ifdef WLAN_FEATURE_VOWIFI_11R
-    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
             "%s: %d: invoked on session %d for UP %d",
             __func__, __LINE__,
             sessionId, up);
@@ -4145,13 +4145,13 @@ eHalStatus sme_QosProcessAddTsRsp(tpAniSirGlobal pMac, void *pMsgBuf)
     if(SME_QOS_EDCA_AC_MAX == ac)
     {
         //err msg
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: invalid AC %d from UP %d",
                 __func__, __LINE__, ac, up);
 
         return eHAL_STATUS_FAILURE;
     }
-    pACInfo = &pSession->ac_info[ac];   
+    pACInfo = &pSession->ac_info[ac];
     if (SME_QOS_HANDOFF == pACInfo->curr_state)
     {
         smsLog(pMac, LOG1, FL("ADDTS Response received for AC %d in HANDOFF State.. Dropping"), ac);
@@ -4161,7 +4161,7 @@ eHalStatus sme_QosProcessAddTsRsp(tpAniSirGlobal pMac, void *pMsgBuf)
 #endif
 
 
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: Invoked on session %d with return code %d",
              __func__, __LINE__,
              sessionId, paddts_rsp->rc);
@@ -4171,7 +4171,7 @@ eHalStatus sme_QosProcessAddTsRsp(tpAniSirGlobal pMac, void *pMsgBuf)
    if(paddts_rsp->rc)
    {
       //event: EVENT_WLAN_QOS
-#ifdef FEATURE_WLAN_DIAG_SUPPORT          
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
       qos.eventId = SME_QOS_DIAG_ADDTS_RSP;
       qos.reasonCode = SME_QOS_DIAG_ADDTS_REFUSED;
       WLAN_VOS_DIAG_EVENT_REPORT(&qos, EVENT_WLAN_QOS);
@@ -4186,15 +4186,15 @@ eHalStatus sme_QosProcessAddTsRsp(tpAniSirGlobal pMac, void *pMsgBuf)
 }
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessDelTsRsp() - Function to process the
-  eWNI_SME_DELTS_RSP came from PE 
-  
-  \param pMac - Pointer to the global MAC parameter structure.  
-  \param pMsgBuf - Pointer to the msg buffer came from PE.   
-  
+  eWNI_SME_DELTS_RSP came from PE
+
+  \param pMac - Pointer to the global MAC parameter structure.
+  \param pMsgBuf - Pointer to the msg buffer came from PE.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessDelTsRsp(tpAniSirGlobal pMac, void *pMsgBuf)
 {
@@ -4202,7 +4202,7 @@ eHalStatus sme_QosProcessDelTsRsp(tpAniSirGlobal pMac, void *pMsgBuf)
    sme_QosSessionInfo *pSession;
    v_U8_t sessionId = pDeltsRsp->sessionId;
    // msg
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: Invoked on session %d with return code %d",
              __func__, __LINE__,
              sessionId, pDeltsRsp->rc);
@@ -4215,17 +4215,17 @@ eHalStatus sme_QosProcessDelTsRsp(tpAniSirGlobal pMac, void *pMsgBuf)
 }
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessDelTsInd() - Function to process the
-  eWNI_SME_DELTS_IND came from PE 
-  
-  Since it's a DELTS indication from AP, will notify all the flows running on 
+  eWNI_SME_DELTS_IND came from PE
+
+  Since it's a DELTS indication from AP, will notify all the flows running on
   this AC about QoS release
-  \param pMac - Pointer to the global MAC parameter structure.  
-  \param pMsgBuf - Pointer to the msg buffer came from PE.   
-  
+  \param pMac - Pointer to the global MAC parameter structure.
+  \param pMsgBuf - Pointer to the msg buffer came from PE.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessDelTsInd(tpAniSirGlobal pMac, void *pMsgBuf)
 {
@@ -4239,7 +4239,7 @@ eHalStatus sme_QosProcessDelTsInd(tpAniSirGlobal pMac, void *pMsgBuf)
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
    WLAN_VOS_DIAG_EVENT_DEF(qos, vos_event_wlan_qos_payload_type);
 #endif
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: Invoked on session %d for UP %d",
              __func__, __LINE__,
              sessionId, up);
@@ -4247,7 +4247,7 @@ eHalStatus sme_QosProcessDelTsInd(tpAniSirGlobal pMac, void *pMsgBuf)
    if(SME_QOS_EDCA_AC_MAX == ac)
    {
       //err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: invalid AC %d from UP %d",
                 __func__, __LINE__,
                 ac, up);
@@ -4265,9 +4265,9 @@ eHalStatus sme_QosProcessDelTsInd(tpAniSirGlobal pMac, void *pMsgBuf)
    // through the callback it registered per request
    if(!HAL_STATUS_SUCCESS(sme_QosFindAllInFlowList(pMac, search_key, sme_QosDelTsIndFnp)))
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: no match found for ac = %d",
-                __func__, __LINE__, 
+                __func__, __LINE__,
                 search_key.key.ac_type);
       //ASSERT
       VOS_ASSERT(0);
@@ -4286,12 +4286,12 @@ eHalStatus sme_QosProcessDelTsInd(tpAniSirGlobal pMac, void *pMsgBuf)
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessAssocCompleteEv() - Function to process the
   SME_QOS_CSR_ASSOC_COMPLETE event indication from CSR
-  \param pEvent_info - Pointer to relevant info from CSR.   
-  
+  \param pEvent_info - Pointer to relevant info from CSR.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessAssocCompleteEv(tpAniSirGlobal pMac, v_U8_t sessionId, void * pEvent_info)
 {
@@ -4299,7 +4299,7 @@ eHalStatus sme_QosProcessAssocCompleteEv(tpAniSirGlobal pMac, v_U8_t sessionId,
    sme_QosACInfo *pACInfo;
    eHalStatus status = eHAL_STATUS_FAILURE;
    sme_QosEdcaAcType ac = SME_QOS_EDCA_AC_BE;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d",
              __func__, __LINE__,
              sessionId);
@@ -4314,7 +4314,7 @@ eHalStatus sme_QosProcessAssocCompleteEv(tpAniSirGlobal pMac, v_U8_t sessionId,
       if(!pEvent_info)
       {
          //err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: pEvent_info is NULL",
                    __func__, __LINE__);
          return status;
@@ -4322,16 +4322,16 @@ eHalStatus sme_QosProcessAssocCompleteEv(tpAniSirGlobal pMac, v_U8_t sessionId,
       if(!((sme_QosAssocInfo *)pEvent_info)->pBssDesc)
       {
          //err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: pBssDesc is NULL",
                    __func__, __LINE__);
          return status;
       }
       if((pSession->assocInfo.pBssDesc) &&
-         (csrIsBssidMatch(pMac, (tCsrBssid *)&pSession->assocInfo.pBssDesc->bssId, 
+         (csrIsBssidMatch(pMac, (tCsrBssid *)&pSession->assocInfo.pBssDesc->bssId,
                           (tCsrBssid *) &(((sme_QosAssocInfo *)pEvent_info)->pBssDesc->bssId))))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: assoc with the same BSS, no update needed",
                    __func__, __LINE__);
       }
@@ -4342,7 +4342,7 @@ eHalStatus sme_QosProcessAssocCompleteEv(tpAniSirGlobal pMac, v_U8_t sessionId,
    }
    else
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: wrong state: BE %d, BK %d, VI %d, VO %d",
                 __func__, __LINE__,
                 pSession->ac_info[SME_QOS_EDCA_AC_BE].curr_state,
@@ -4364,7 +4364,7 @@ eHalStatus sme_QosProcessAssocCompleteEv(tpAniSirGlobal pMac, v_U8_t sessionId,
    }
    else
    {
-      for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+      for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
       {
          pACInfo = &pSession->ac_info[ac];
          switch(pACInfo->curr_state)
@@ -4378,7 +4378,7 @@ eHalStatus sme_QosProcessAssocCompleteEv(tpAniSirGlobal pMac, v_U8_t sessionId,
             case SME_QOS_HANDOFF:
             case SME_QOS_CLOSED:
             default:
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                          "%s: %d: On session %d AC %d is in wrong state %d",
                          __func__, __LINE__,
                          sessionId, ac, pACInfo->curr_state);
@@ -4393,19 +4393,19 @@ eHalStatus sme_QosProcessAssocCompleteEv(tpAniSirGlobal pMac, v_U8_t sessionId,
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessReassocReqEv() - Function to process the
   SME_QOS_CSR_REASSOC_REQ event indication from CSR
-  \param pEvent_info - Pointer to relevant info from CSR.   
-  
+  \param pEvent_info - Pointer to relevant info from CSR.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessReassocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, void * pEvent_info)
 {
    sme_QosSessionInfo *pSession;
    sme_QosACInfo *pACInfo;
    sme_QosEdcaAcType ac;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d",
              __func__, __LINE__,
              sessionId);
@@ -4433,7 +4433,7 @@ eHalStatus sme_QosProcessReassocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, voi
 
    if(pSession->handoffRequested)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: no need for state transition, should "
                 "already be in handoff state",
                 __func__, __LINE__);
@@ -4457,7 +4457,7 @@ eHalStatus sme_QosProcessReassocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, voi
 #ifdef WLAN_FEATURE_VOWIFI_11R
    if(pSession->ftHandoffInProgress)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: no need for state transition, should "
                 "already be in handoff state",
                 __func__, __LINE__);
@@ -4476,7 +4476,7 @@ eHalStatus sme_QosProcessReassocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, voi
    }
 #endif
 
-   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
    {
       pACInfo = &pSession->ac_info[ac];
       switch(pACInfo->curr_state)
@@ -4492,7 +4492,7 @@ eHalStatus sme_QosProcessReassocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, voi
          case SME_QOS_CLOSED:
          case SME_QOS_INIT:
          default:
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: On session %d AC %d is in wrong state %d",
                       __func__, __LINE__,
                       sessionId, ac, pACInfo->curr_state);
@@ -4506,12 +4506,12 @@ eHalStatus sme_QosProcessReassocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, voi
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessReassocSuccessEv() - Function to process the
   SME_QOS_CSR_REASSOC_COMPLETE event indication from CSR
-  \param pEvent_info - Pointer to relevant info from CSR.   
-  
+  \param pEvent_info - Pointer to relevant info from CSR.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId, void * pEvent_info)
 {
@@ -4526,7 +4526,7 @@ eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
    tListElem *pEntry= NULL;
    sme_QosFlowInfoEntry *flow_info = NULL;
 
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d",
              __func__, __LINE__,
              sessionId);
@@ -4549,7 +4549,7 @@ eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
    if(!pEvent_info)
    {
       //err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: pEvent_info is NULL",
                 __func__, __LINE__);
       return status;
@@ -4557,7 +4557,7 @@ eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
    if(!((sme_QosAssocInfo *)pEvent_info)->pBssDesc)
    {
       //err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: pBssDesc is NULL",
                 __func__, __LINE__);
       return status;
@@ -4566,11 +4566,11 @@ eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
    if(status)
    {
       //err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: sme_QosSaveAssocInfo() failed",
                 __func__, __LINE__);
    }
-//TBH: Assuming both handoff algo & 11r willn't be enabled at the same time   
+//TBH: Assuming both handoff algo & 11r willn't be enabled at the same time
    if(pSession->handoffRequested)
    {
       pSession->handoffRequested = VOS_FALSE;
@@ -4605,7 +4605,7 @@ eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
 #endif
 
    pSession->sessionActive = VOS_TRUE;
-   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
    {
       pACInfo = &pSession->ac_info[ac];
       switch(pACInfo->curr_state)
@@ -4631,7 +4631,7 @@ eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
                //pACInfo->tspec_pending = 0;
                sme_QosStateTransition(sessionId, ac, SME_QOS_QOS_ON);
                // notify HDD with new Service Interval
-               pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0] = 
+               pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0] =
                   pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0];
                vos_mem_zero(&search_key, sizeof(sme_QosSearchInfo));
                //set the key type & the key to be searched in the Flow List
@@ -4658,11 +4658,11 @@ eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
                      }
                   }
                }
-               //notify HDD the success for the requested flow 
+               //notify HDD the success for the requested flow
                //notify all the other flows running on the AC that QoS got modified
                if(!HAL_STATUS_SUCCESS(sme_QosFindAllInFlowList(pMac, search_key, sme_QosReassocSuccessEvFnp)))
                {
-                  VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+                  VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                             "%s: %d: no match found for ac = %d",
                             __func__, __LINE__,
                             search_key.key.ac_type);
@@ -4671,7 +4671,7 @@ eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
                   return eHAL_STATUS_FAILURE;
                }
                pACInfo->hoRenewal = VOS_FALSE;
-               vos_mem_zero(&pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0], 
+               vos_mem_zero(&pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0],
                             sizeof(sme_QosWmmTspecInfo));
             }
             status = eHAL_STATUS_SUCCESS;
@@ -4685,7 +4685,7 @@ eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
          case SME_QOS_REQUESTED:
          case SME_QOS_QOS_ON:
          default:
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: On session %d AC %d is in wrong state %d",
                       __func__, __LINE__,
                       sessionId, ac, pACInfo->curr_state);
@@ -4701,19 +4701,19 @@ eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessReassocFailureEv() - Function to process the
   SME_QOS_CSR_REASSOC_FAILURE event indication from CSR
-  \param pEvent_info - Pointer to relevant info from CSR.   
-  
+  \param pEvent_info - Pointer to relevant info from CSR.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessReassocFailureEv(tpAniSirGlobal pMac, v_U8_t sessionId, void * pEvent_info)
 {
    sme_QosSessionInfo *pSession;
    sme_QosACInfo *pACInfo;
    sme_QosEdcaAcType ac;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d",
              __func__, __LINE__,
              sessionId);
@@ -4721,7 +4721,7 @@ eHalStatus sme_QosProcessReassocFailureEv(tpAniSirGlobal pMac, v_U8_t sessionId,
    // our pending reassociation has completed
    // we can allow powersave
    pSession->readyForPowerSave = VOS_TRUE;
-   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
    {
       pACInfo = &pSession->ac_info[ac];
       switch(pACInfo->curr_state)
@@ -4732,13 +4732,13 @@ eHalStatus sme_QosProcessReassocFailureEv(tpAniSirGlobal pMac, v_U8_t sessionId,
             {
                pACInfo->reassoc_pending = VOS_FALSE;
             }
-            vos_mem_zero(&pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0], 
+            vos_mem_zero(&pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0],
                          sizeof(sme_QosWmmTspecInfo));
-            vos_mem_zero(&pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0], 
+            vos_mem_zero(&pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0],
                          sizeof(sme_QosWmmTspecInfo));
-            vos_mem_zero(&pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_1], 
+            vos_mem_zero(&pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_1],
                          sizeof(sme_QosWmmTspecInfo));
-            vos_mem_zero(&pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_1], 
+            vos_mem_zero(&pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_1],
                          sizeof(sme_QosWmmTspecInfo));
             pACInfo->tspec_mask_status = SME_QOS_TSPEC_MASK_CLEAR;
             pACInfo->tspec_pending = 0;
@@ -4753,7 +4753,7 @@ eHalStatus sme_QosProcessReassocFailureEv(tpAniSirGlobal pMac, v_U8_t sessionId,
          case SME_QOS_REQUESTED:
          case SME_QOS_QOS_ON:
          default:
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: On session %d AC %d is in wrong state %d",
                       __func__, __LINE__,
                       sessionId, ac, pACInfo->curr_state);
@@ -4769,24 +4769,24 @@ eHalStatus sme_QosProcessReassocFailureEv(tpAniSirGlobal pMac, v_U8_t sessionId,
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessHandoffAssocReqEv() - Function to process the
   SME_QOS_CSR_HANDOFF_ASSOC_REQ event indication from CSR
-  \param pEvent_info - Pointer to relevant info from CSR.   
-  
+  \param pEvent_info - Pointer to relevant info from CSR.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessHandoffAssocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, void * pEvent_info)
 {
    sme_QosSessionInfo *pSession;
    sme_QosACInfo *pACInfo;
    v_U8_t ac;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d",
              __func__, __LINE__,
              sessionId);
    pSession = &sme_QosCb.sessionInfo[sessionId];
-   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
    {
       pACInfo = &pSession->ac_info[ac];
       switch(pACInfo->curr_state)
@@ -4804,15 +4804,15 @@ eHalStatus sme_QosProcessHandoffAssocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId
                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                          "%s: %d: SME_QOS_CSR_HANDOFF_ASSOC_REQ received in "
                          "SME_QOS_HANDOFF state with FT in progress"
-                         , __func__, __LINE__); 
-               break; 
+                         , __func__, __LINE__);
+               break;
             }
-#endif            
+#endif
 
          case SME_QOS_CLOSED:
          case SME_QOS_INIT:
          default:
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: On session %d AC %d is in wrong state %d",
                       __func__, __LINE__,
                       sessionId, ac, pACInfo->curr_state);
@@ -4847,12 +4847,12 @@ eHalStatus sme_QosProcessHandoffAssocReqEv(tpAniSirGlobal pMac, v_U8_t sessionId
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessHandoffSuccessEv() - Function to process the
   SME_QOS_CSR_HANDOFF_COMPLETE event indication from CSR
-  \param pEvent_info - Pointer to relevant info from CSR.   
-  
+  \param pEvent_info - Pointer to relevant info from CSR.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessHandoffSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId, void * pEvent_info)
 {
@@ -4860,13 +4860,13 @@ eHalStatus sme_QosProcessHandoffSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
    sme_QosACInfo *pACInfo;
    v_U8_t ac;
    eHalStatus status = eHAL_STATUS_FAILURE;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d",
              __func__, __LINE__,
              sessionId);
    pSession = &sme_QosCb.sessionInfo[sessionId];
    //go back to original state before handoff
-   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
    {
       pACInfo = &pSession->ac_info[ac];
       switch(pACInfo->curr_state)
@@ -4880,7 +4880,7 @@ eHalStatus sme_QosProcessHandoffSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
             }
             status = eHAL_STATUS_SUCCESS;
             break;
-         // FT logic, has already moved it to QOS_REQUESTED state during the 
+         // FT logic, has already moved it to QOS_REQUESTED state during the
          // reassoc request event, which would include the Qos (TSPEC) params
          // in the reassoc req frame
          case SME_QOS_REQUESTED:
@@ -4896,7 +4896,7 @@ eHalStatus sme_QosProcessHandoffSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
             if( pSession->ftHandoffInProgress )
                break;
 #endif
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: On session %d AC %d is in wrong state %d",
                       __func__, __LINE__,
                       sessionId, ac, pACInfo->curr_state);
@@ -4910,24 +4910,24 @@ eHalStatus sme_QosProcessHandoffSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId,
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessHandoffFailureEv() - Function to process the
   SME_QOS_CSR_HANDOFF_FAILURE event indication from CSR
-  \param pEvent_info - Pointer to relevant info from CSR.   
-  
+  \param pEvent_info - Pointer to relevant info from CSR.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessHandoffFailureEv(tpAniSirGlobal pMac, v_U8_t sessionId, void * pEvent_info)
 {
    sme_QosSessionInfo *pSession;
    sme_QosACInfo *pACInfo;
    v_U8_t ac;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d",
              __func__, __LINE__,
              sessionId);
    pSession = &sme_QosCb.sessionInfo[sessionId];
-   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
    {
       pACInfo = &pSession->ac_info[ac];
       switch(pACInfo->curr_state)
@@ -4935,13 +4935,13 @@ eHalStatus sme_QosProcessHandoffFailureEv(tpAniSirGlobal pMac, v_U8_t sessionId,
          case SME_QOS_HANDOFF:
             sme_QosStateTransition(sessionId, ac, SME_QOS_INIT);
             //need to clean up flows: TODO
-            vos_mem_zero(&pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0], 
+            vos_mem_zero(&pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0],
                          sizeof(sme_QosWmmTspecInfo));
-            vos_mem_zero(&pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0], 
+            vos_mem_zero(&pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0],
                          sizeof(sme_QosWmmTspecInfo));
-            vos_mem_zero(&pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_1], 
+            vos_mem_zero(&pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_1],
                          sizeof(sme_QosWmmTspecInfo));
-            vos_mem_zero(&pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_1], 
+            vos_mem_zero(&pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_1],
                          sizeof(sme_QosWmmTspecInfo));
             pACInfo->tspec_mask_status = SME_QOS_TSPEC_MASK_CLEAR;
             pACInfo->tspec_pending = 0;
@@ -4954,7 +4954,7 @@ eHalStatus sme_QosProcessHandoffFailureEv(tpAniSirGlobal pMac, v_U8_t sessionId,
          case SME_QOS_REQUESTED:
          case SME_QOS_QOS_ON:
          default:
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: On session %d AC %d is in wrong state %d",
                       __func__, __LINE__,
                       sessionId, ac, pACInfo->curr_state);
@@ -4975,19 +4975,19 @@ eHalStatus sme_QosProcessHandoffFailureEv(tpAniSirGlobal pMac, v_U8_t sessionId,
 }
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessDisconnectEv() - Function to process the
-  SME_QOS_CSR_DISCONNECT_REQ or  SME_QOS_CSR_DISCONNECT_IND event indication 
+  SME_QOS_CSR_DISCONNECT_REQ or  SME_QOS_CSR_DISCONNECT_IND event indication
   from CSR
-  \param pEvent_info - Pointer to relevant info from CSR.   
-  
+  \param pEvent_info - Pointer to relevant info from CSR.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessDisconnectEv(tpAniSirGlobal pMac, v_U8_t sessionId, void * pEvent_info)
 {
    sme_QosSessionInfo *pSession;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d",
              __func__, __LINE__,
              sessionId);
@@ -5000,7 +5000,7 @@ eHalStatus sme_QosProcessDisconnectEv(tpAniSirGlobal pMac, v_U8_t sessionId, voi
 #endif
       )
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: no need for state transition, should "
                 "already be in handoff state",
                 __func__, __LINE__);
@@ -5054,25 +5054,25 @@ eHalStatus sme_QosProcessDisconnectEv(tpAniSirGlobal pMac, v_U8_t sessionId, voi
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessJoinReqEv() - Function to process the
   SME_QOS_CSR_JOIN_REQ event indication from CSR
-  \param pEvent_info - Pointer to relevant info from CSR.   
-  
+  \param pEvent_info - Pointer to relevant info from CSR.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessJoinReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, void * pEvent_info)
 {
    sme_QosSessionInfo *pSession;
    sme_QosEdcaAcType ac;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d",
              __func__, __LINE__,
              sessionId);
    pSession = &sme_QosCb.sessionInfo[sessionId];
    if(pSession->handoffRequested)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: no need for state transition, should "
                 "already be in handoff state",
                 __func__, __LINE__);
@@ -5092,7 +5092,7 @@ eHalStatus sme_QosProcessJoinReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, void *
       return eHAL_STATUS_SUCCESS;
    }
 
-   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
    {
       sme_QosStateTransition(sessionId, ac, SME_QOS_INIT);
    }
@@ -5110,12 +5110,12 @@ eHalStatus sme_QosProcessJoinReqEv(tpAniSirGlobal pMac, v_U8_t sessionId, void *
   \brief sme_QosProcessPreauthSuccessInd() - Function to process the
   SME_QOS_CSR_PREAUTH_SUCCESS_IND event indication from CSR
 
-  \param pEvent_info - Pointer to relevant info from CSR.   
-  
+  \param pEvent_info - Pointer to relevant info from CSR.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessPreauthSuccessInd(tpAniSirGlobal pMac, v_U8_t sessionId, void * pEvent_info)
 {
@@ -5160,7 +5160,7 @@ eHalStatus sme_QosProcessPreauthSuccessInd(tpAniSirGlobal pMac, v_U8_t sessionId
     pSession->ftHandoffInProgress = VOS_TRUE;
 
     // Check if its a 11R roaming before preparing the RIC IEs
-    if (csrRoamIs11rAssoc(pMac)) 
+    if (csrRoamIs11rAssoc(pMac))
     {
         v_U16_t ricOffset = 0;
         v_U32_t ricIELength = 0;
@@ -5183,8 +5183,8 @@ eHalStatus sme_QosProcessPreauthSuccessInd(tpAniSirGlobal pMac, v_U8_t sessionId
             tspec_pending_status = pACInfo->tspec_pending;
             tspec_mask_status = pACInfo->tspec_mask_status;
             vos_mem_zero(pACInfo->ricIdentifier, SME_QOS_TSPEC_INDEX_MAX);
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
-                    FL("AC %d ==> TSPEC status = %d, tspec pending = %d"), 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
+                    FL("AC %d ==> TSPEC status = %d, tspec pending = %d"),
                     ac, tspec_mask_status, tspec_pending_status);
 
             do
@@ -5221,20 +5221,20 @@ eHalStatus sme_QosProcessPreauthSuccessInd(tpAniSirGlobal pMac, v_U8_t sessionId
 
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessAddTsFailureRsp() - Function to process the
-  Addts request failure response came from PE 
-  
-  We will notify HDD only for the requested Flow, other Flows running on the AC 
+  Addts request failure response came from PE
+
+  We will notify HDD only for the requested Flow, other Flows running on the AC
   stay intact
-  
-  \param pMac - Pointer to the global MAC parameter structure.  
-  \param pRsp - Pointer to the addts response structure came from PE.   
-  
+
+  \param pMac - Pointer to the global MAC parameter structure.
+  \param pRsp - Pointer to the addts response structure came from PE.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
-eHalStatus sme_QosProcessAddTsFailureRsp(tpAniSirGlobal pMac, 
+eHalStatus sme_QosProcessAddTsFailureRsp(tpAniSirGlobal pMac,
                                          v_U8_t sessionId,
                                          tSirAddtsRspInfo * pRsp)
 {
@@ -5244,7 +5244,7 @@ eHalStatus sme_QosProcessAddTsFailureRsp(tpAniSirGlobal pMac,
    sme_QosSearchInfo search_key;
    v_U8_t tspec_pending;
    sme_QosWmmUpType up = (sme_QosWmmUpType)pRsp->tspec.tsinfo.traffic.userPrio;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d for UP %d",
              __func__, __LINE__,
              sessionId, up);
@@ -5252,7 +5252,7 @@ eHalStatus sme_QosProcessAddTsFailureRsp(tpAniSirGlobal pMac,
    if(SME_QOS_EDCA_AC_MAX == ac)
    {
       //err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: invalid AC %d from UP %d",
                 __func__, __LINE__, ac, up);
       return eHAL_STATUS_FAILURE;
@@ -5264,7 +5264,7 @@ eHalStatus sme_QosProcessAddTsFailureRsp(tpAniSirGlobal pMac,
    if(!tspec_pending)
    {
       //ASSERT
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: On session %d an AddTS is not pending on AC %d",
                 __func__, __LINE__,
                 sessionId, ac);
@@ -5279,7 +5279,7 @@ eHalStatus sme_QosProcessAddTsFailureRsp(tpAniSirGlobal pMac,
    search_key.sessionId = sessionId;
    if(!HAL_STATUS_SUCCESS(sme_QosFindAllInFlowList(pMac, search_key, sme_QosAddTsFailureFnp)))
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: On session %d no match found for ac = %d",
                 __func__, __LINE__,
                 sessionId, search_key.key.ac_type);
@@ -5287,13 +5287,13 @@ eHalStatus sme_QosProcessAddTsFailureRsp(tpAniSirGlobal pMac,
       VOS_ASSERT(0);
       return eHAL_STATUS_FAILURE;
    }
-   vos_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1], 
+   vos_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1],
                 sizeof(sme_QosWmmTspecInfo));
 
    if((!pACInfo->num_flows[0])&&
       (!pACInfo->num_flows[1]))
    {
-      pACInfo->tspec_mask_status &= SME_QOS_TSPEC_MASK_BIT_1_2_SET & 
+      pACInfo->tspec_mask_status &= SME_QOS_TSPEC_MASK_BIT_1_2_SET &
          (~pACInfo->tspec_pending);
       sme_QosStateTransition(sessionId, ac, SME_QOS_LINK_UP);
    }
@@ -5312,16 +5312,16 @@ eHalStatus sme_QosProcessAddTsFailureRsp(tpAniSirGlobal pMac,
   \brief sme_QosUpdateTspecMask() - Utiltity function to update the tspec.
   Typical usage while aggregating unidirectional flows into a bi-directional
   flow on AC which is running multiple flows
-  
+
   \param sessionId - Session upon which the TSPEC is being updated
   \param ac - Enumeration of the various EDCA Access Categories.
   \param old_tspec_mask - on which tspec per AC, the update is requested
   \param new_tspec_mask - tspec to be set for this AC
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 static eHalStatus sme_QosUpdateTspecMask(v_U8_t sessionId,
                                       sme_QosSearchInfo search_key,
@@ -5332,20 +5332,20 @@ static eHalStatus sme_QosUpdateTspecMask(v_U8_t sessionId,
    sme_QosSessionInfo *pSession;
    sme_QosACInfo *pACInfo;
 
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d for AC %d TSPEC %d",
              __func__, __LINE__,
              sessionId, search_key.key.ac_type, new_tspec_mask);
 
    pSession = &sme_QosCb.sessionInfo[sessionId];
-   
+
    if (search_key.key.ac_type < SME_QOS_EDCA_AC_MAX)
    {
    pACInfo = &pSession->ac_info[search_key.key.ac_type];
    }
    else
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Exceeded the array bounds of pSession->ac_info",
                 __func__, __LINE__);
       VOS_ASSERT (0);
@@ -5355,7 +5355,7 @@ static eHalStatus sme_QosUpdateTspecMask(v_U8_t sessionId,
    pEntry = csrLLPeekHead( &sme_QosCb.flow_list, VOS_FALSE );
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Flow List empty, nothing to update",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
@@ -5374,7 +5374,7 @@ static eHalStatus sme_QosUpdateTspecMask(v_U8_t sessionId,
                (search_key.direction == flow_info->QoSInfo.ts_info.direction))
             {
                //msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: Flow %d matches",
                          __func__, __LINE__,
                          flow_info->QosFlowID);
@@ -5389,7 +5389,7 @@ static eHalStatus sme_QosUpdateTspecMask(v_U8_t sessionId,
                (search_key.tspec_mask == flow_info->tspec_mask))
             {
                //msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: Flow %d matches",
                          __func__, __LINE__,
                          flow_info->QosFlowID);
@@ -5407,21 +5407,21 @@ static eHalStatus sme_QosUpdateTspecMask(v_U8_t sessionId,
 }
 /*--------------------------------------------------------------------------
   \brief sme_QosProcessAddTsSuccessRsp() - Function to process the
-  Addts request success response came from PE 
-  
-  We will notify HDD with addts success for the requested Flow, & for other 
-  Flows running on the AC we will send an addts modify status 
-  
-  
-  \param pMac - Pointer to the global MAC parameter structure.  
-  \param pRsp - Pointer to the addts response structure came from PE.   
-  
+  Addts request success response came from PE
+
+  We will notify HDD with addts success for the requested Flow, & for other
+  Flows running on the AC we will send an addts modify status
+
+
+  \param pMac - Pointer to the global MAC parameter structure.
+  \param pRsp - Pointer to the addts response structure came from PE.
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
-eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac, 
+eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac,
                                          v_U8_t sessionId,
                                          tSirAddtsRspInfo * pRsp)
 {
@@ -5438,7 +5438,7 @@ eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac,
    WLAN_VOS_DIAG_EVENT_DEF(qos, vos_event_wlan_qos_payload_type);
    vos_log_qos_tspec_pkt_type *log_ptr = NULL;
 #endif //FEATURE_WLAN_DIAG_SUPPORT
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d for UP %d",
              __func__, __LINE__,
              sessionId, up);
@@ -5447,7 +5447,7 @@ eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac,
    if(SME_QOS_EDCA_AC_MAX == ac)
    {
       //err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: invalid AC %d from UP %d",
                 __func__, __LINE__, ac, up);
       return eHAL_STATUS_FAILURE;
@@ -5457,13 +5457,13 @@ eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac,
    tspec_pending = pACInfo->tspec_pending;
    if(!tspec_pending)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: On session %d an AddTS is not pending on AC %d",
                 __func__, __LINE__,
                 sessionId, ac);
       return eHAL_STATUS_FAILURE;
    }
-   //App is looking for APSD or the App which was looking for APSD has been 
+   //App is looking for APSD or the App which was looking for APSD has been
    //released, so STA re-negotiated with AP
    if(pACInfo->requested_QoSInfo[tspec_pending - 1].ts_info.psb)
    {
@@ -5473,7 +5473,7 @@ eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac,
    else
    {
       if(((SME_QOS_TSPEC_MASK_BIT_1_2_SET & ~tspec_pending) > 0) &&
-         ((SME_QOS_TSPEC_MASK_BIT_1_2_SET & ~tspec_pending) <= 
+         ((SME_QOS_TSPEC_MASK_BIT_1_2_SET & ~tspec_pending) <=
             SME_QOS_TSPEC_INDEX_MAX))
       {
       if(!pACInfo->requested_QoSInfo
@@ -5485,7 +5485,7 @@ eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac,
    }
       else
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                    "%s: %d: Exceeded the array bounds of pACInfo->requested_QosInfo",
                    __func__, __LINE__);
          VOS_ASSERT (0);
@@ -5579,11 +5579,11 @@ eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac,
    search_key.key.ac_type = ac;
    search_key.index = SME_QOS_SEARCH_KEY_INDEX_2;
    search_key.sessionId = sessionId;
-   //notify HDD the success for the requested flow 
+   //notify HDD the success for the requested flow
    //notify all the other flows running on the AC that QoS got modified
    if(!HAL_STATUS_SUCCESS(sme_QosFindAllInFlowList(pMac, search_key, sme_QosAddTsSuccessFnp)))
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: On session %d no match found for ac %d",
                 __func__, __LINE__,
                 sessionId, search_key.key.ac_type);
@@ -5592,10 +5592,10 @@ eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac,
       return eHAL_STATUS_FAILURE;
    }
    pACInfo->hoRenewal = VOS_FALSE;
-   vos_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1], 
+   vos_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1],
                 sizeof(sme_QosWmmTspecInfo));
    //event: EVENT_WLAN_QOS
-#ifdef FEATURE_WLAN_DIAG_SUPPORT          
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
    qos.eventId = SME_QOS_DIAG_ADDTS_RSP;
    qos.reasonCode = SME_QOS_DIAG_ADDTS_ADMISSION_ACCEPTED;
    WLAN_VOS_DIAG_EVENT_REPORT(&qos, EVENT_WLAN_QOS);
@@ -5641,21 +5641,21 @@ eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac,
 
    (void)sme_QosProcessBufferedCmd(sessionId);
    return eHAL_STATUS_SUCCESS;
-   
+
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosAggregateParams() - Utiltity function to increament the TSPEC 
+  \brief sme_QosAggregateParams() - Utiltity function to increament the TSPEC
   params per AC. Typical usage while using flow aggregation or deletion of flows
-  
-  \param pInput_Tspec_Info - Pointer to sme_QosWmmTspecInfo which contains the 
+
+  \param pInput_Tspec_Info - Pointer to sme_QosWmmTspecInfo which contains the
   WMM TSPEC related info with which pCurrent_Tspec_Info will be updated
-  \param pCurrent_Tspec_Info - Pointer to sme_QosWmmTspecInfo which contains 
+  \param pCurrent_Tspec_Info - Pointer to sme_QosWmmTspecInfo which contains
   current the WMM TSPEC related info
 
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosAggregateParams(
    sme_QosWmmTspecInfo * pInput_Tspec_Info,
@@ -5663,24 +5663,24 @@ eHalStatus sme_QosAggregateParams(
    sme_QosWmmTspecInfo * pUpdated_Tspec_Info)
 {
    sme_QosWmmTspecInfo TspecInfo;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked",
              __func__, __LINE__);
    if(!pInput_Tspec_Info)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: input is NULL, nothing to aggregate",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
    }
    if(!pCurrent_Tspec_Info)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Current is NULL, can't aggregate",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
    }
-   vos_mem_copy(&TspecInfo, pCurrent_Tspec_Info, 
+   vos_mem_copy(&TspecInfo, pCurrent_Tspec_Info,
                 sizeof(sme_QosWmmTspecInfo));
    TspecInfo.ts_info.psb = pInput_Tspec_Info->ts_info.psb;
    /*-------------------------------------------------------------------------
@@ -5716,7 +5716,7 @@ eHalStatus sme_QosAggregateParams(
      If directions don't match, it must necessarily be both uplink and
      downlink
    -------------------------------------------------------------------------*/
-   if(pCurrent_Tspec_Info->ts_info.direction != 
+   if(pCurrent_Tspec_Info->ts_info.direction !=
       pInput_Tspec_Info->ts_info.direction)
    {
       TspecInfo.ts_info.direction = SME_QOS_WMM_TS_DIR_BOTH;
@@ -5769,7 +5769,7 @@ eHalStatus sme_QosAggregateParams(
    }
 
    /*-------------------------------------------------------------------------
-     Data rates: 
+     Data rates:
      Add up the rates for aggregation
    -------------------------------------------------------------------------*/
    SME_QOS_BOUNDED_U32_ADD_Y_TO_X( TspecInfo.peak_data_rate,
@@ -5785,7 +5785,7 @@ eHalStatus sme_QosAggregateParams(
      spec it is less than or equal to inactivity interval
      This is not provided by app since we currently don't support the HCCA
      mode of operation
-     Currently set it to 0 to avoid confusion: Cisco CCX needs ~0; spec 
+     Currently set it to 0 to avoid confusion: Cisco CCX needs ~0; spec
      requires inactivity interval to be > suspension interval: this could
      be tricky!
    -------------------------------------------------------------------------*/
@@ -5816,33 +5816,33 @@ eHalStatus sme_QosAggregateParams(
    }
    if(pUpdated_Tspec_Info)
    {
-      vos_mem_copy(pUpdated_Tspec_Info, &TspecInfo, 
+      vos_mem_copy(pUpdated_Tspec_Info, &TspecInfo,
                    sizeof(sme_QosWmmTspecInfo));
    }
    else
    {
-      vos_mem_copy(pCurrent_Tspec_Info, &TspecInfo, 
+      vos_mem_copy(pCurrent_Tspec_Info, &TspecInfo,
                    sizeof(sme_QosWmmTspecInfo));
    }
    return eHAL_STATUS_SUCCESS;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosUpdateParams() - Utiltity function to update the TSPEC 
+  \brief sme_QosUpdateParams() - Utiltity function to update the TSPEC
   params per AC. Typical usage while deleting flows on AC which is running
   multiple flows
-  
+
   \param sessionId - Session upon which the TSPEC is being updated
   \param ac - Enumeration of the various EDCA Access Categories.
   \param tspec_mask - on which tspec per AC, the update is requested
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 static eHalStatus sme_QosUpdateParams(v_U8_t sessionId,
                                       sme_QosEdcaAcType ac,
-                                      v_U8_t tspec_mask, 
+                                      v_U8_t tspec_mask,
                                       sme_QosWmmTspecInfo * pTspec_Info)
 {
    tListElem *pEntry= NULL, *pNextEntry = NULL;
@@ -5850,13 +5850,13 @@ static eHalStatus sme_QosUpdateParams(v_U8_t sessionId,
    sme_QosACInfo *pACInfo;
    sme_QosFlowInfoEntry *flow_info = NULL;
    sme_QosWmmTspecInfo Tspec_Info;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: invoked on session %d for AC %d TSPEC %d",
              __func__, __LINE__,
              sessionId, ac, tspec_mask);
    if(!pTspec_Info)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: output is NULL, can't aggregate",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
@@ -5865,7 +5865,7 @@ static eHalStatus sme_QosUpdateParams(v_U8_t sessionId,
    pEntry = csrLLPeekHead( &sme_QosCb.flow_list, VOS_FALSE );
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Flow List empty, nothing to update",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
@@ -5884,27 +5884,27 @@ static eHalStatus sme_QosUpdateParams(v_U8_t sessionId,
          (ac == flow_info->ac_type) &&
          (tspec_mask == flow_info->tspec_mask))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                    "%s: %d: Flow %d matches",
                    __func__, __LINE__,
                    flow_info->QosFlowID);
-         
+
          if((SME_QOS_REASON_RELEASE == flow_info->reason ) ||
             (SME_QOS_REASON_MODIFY == flow_info->reason))
          {
             //msg
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                       "%s: %d: Skipping Flow %d as it is marked "
                       "for release/modify",
                       __func__, __LINE__,
                       flow_info->QosFlowID);
          }
-         else if(!HAL_STATUS_SUCCESS(sme_QosAggregateParams(&flow_info->QoSInfo, 
+         else if(!HAL_STATUS_SUCCESS(sme_QosAggregateParams(&flow_info->QoSInfo,
                                                             &Tspec_Info,
                                                             NULL)))
          {
             //err msg
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: sme_QosAggregateParams() failed",
                       __func__, __LINE__);
          }
@@ -5921,9 +5921,9 @@ static eHalStatus sme_QosUpdateParams(v_U8_t sessionId,
   Mapping is done for consistency
   \param ac - Enumeration of the various EDCA Access Categories.
   \return an User Priority
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 sme_QosWmmUpType sme_QosAcToUp(sme_QosEdcaAcType ac)
 {
@@ -5932,7 +5932,7 @@ sme_QosWmmUpType sme_QosAcToUp(sme_QosEdcaAcType ac)
    {
       up = sme_QosACtoUPMap[ac];
    }
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
              "%s: %d: ac = %d up = %d returned",
              __func__, __LINE__, ac, up);
    return up;
@@ -5941,9 +5941,9 @@ sme_QosWmmUpType sme_QosAcToUp(sme_QosEdcaAcType ac)
   \brief sme_QosUpToAc() - Utiltity function to map an UP to AC
   \param up - Enumeration of the various User priorities (UP).
   \return an Access Category
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 sme_QosEdcaAcType sme_QosUpToAc(sme_QosWmmUpType up)
 {
@@ -5952,7 +5952,7 @@ sme_QosEdcaAcType sme_QosUpToAc(sme_QosWmmUpType up)
    {
       ac = sme_QosUPtoACMap[up];
    }
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
              "%s: %d: up = %d ac = %d returned",
              __func__, __LINE__, up, ac);
    return ac;
@@ -5963,11 +5963,11 @@ sme_QosEdcaAcType sme_QosUpToAc(sme_QosWmmUpType up)
   \param sessionId - Session upon which the state machine is running
   \param ac - Enumeration of the various EDCA Access Categories.
   \param new_state - The state FSM is moving to.
-  
+
   \return None
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 static void sme_QosStateTransition(v_U8_t sessionId,
                                    sme_QosEdcaAcType ac,
@@ -5981,21 +5981,21 @@ static void sme_QosStateTransition(v_U8_t sessionId,
    pACInfo->curr_state = new_state;
    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: On session %d new state=%d, old state=%d, for AC=%d",
-             __func__, __LINE__, 
+             __func__, __LINE__,
              sessionId, pACInfo->curr_state, pACInfo->prev_state, ac );
 }
 /*--------------------------------------------------------------------------
   \brief sme_QosFindInFlowList() - Utility function to find an flow entry from
   the flow_list.
-  \param search_key -  We can either use the flowID or the ac type to find the 
+  \param search_key -  We can either use the flowID or the ac type to find the
   entry in the flow list.
   A bitmap in sme_QosSearchInfo tells which key to use. Starting from LSB,
   bit 0 - Flow ID
   bit 1 - AC type
   \return the pointer to the entry in the link list
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 tListElem *sme_QosFindInFlowList(sme_QosSearchInfo search_key)
 {
@@ -6004,7 +6004,7 @@ tListElem *sme_QosFindInFlowList(sme_QosSearchInfo search_key)
    pEntry = csrLLPeekHead( &sme_QosCb.flow_list, VOS_FALSE );
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Flow List empty, can't search",
                 __func__, __LINE__);
       return NULL;
@@ -6021,7 +6021,7 @@ tListElem *sme_QosFindInFlowList(sme_QosSearchInfo search_key)
             if(search_key.key.QosFlowID == flow_info->QosFlowID)
             {
                //msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: match found on flowID, ending search",
                          __func__, __LINE__);
                break;
@@ -6032,7 +6032,7 @@ tListElem *sme_QosFindInFlowList(sme_QosSearchInfo search_key)
             if(search_key.key.ac_type == flow_info->ac_type)
             {
                //msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: match found on ac, ending search",
                          __func__, __LINE__);
                break;
@@ -6043,7 +6043,7 @@ tListElem *sme_QosFindInFlowList(sme_QosSearchInfo search_key)
             if(search_key.key.reason == flow_info->reason)
             {
                //msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: match found on reason, ending search",
                          __func__, __LINE__);
                break;
@@ -6051,11 +6051,11 @@ tListElem *sme_QosFindInFlowList(sme_QosSearchInfo search_key)
          }
          else if(search_key.index & SME_QOS_SEARCH_KEY_INDEX_4)
          {
-            if((search_key.key.ac_type == flow_info->ac_type) && 
+            if((search_key.key.ac_type == flow_info->ac_type) &&
                (search_key.direction == flow_info->QoSInfo.ts_info.direction))
             {
                //msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: match found on reason, ending search",
                          __func__, __LINE__);
 
@@ -6068,21 +6068,21 @@ tListElem *sme_QosFindInFlowList(sme_QosSearchInfo search_key)
    return pEntry;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosFindAllInFlowList() - Utility function to find an flow entry 
+  \brief sme_QosFindAllInFlowList() - Utility function to find an flow entry
   from the flow_list & act on it.
-  \param search_key -  We can either use the flowID or the ac type to find the 
+  \param search_key -  We can either use the flowID or the ac type to find the
   entry in the flow list.
   A bitmap in sme_QosSearchInfo tells which key to use. Starting from LSB,
   bit 0 - Flow ID
   bit 1 - AC type
   \param fnp - function pointer specifying the action type for the entry found
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosFindAllInFlowList(tpAniSirGlobal pMac,
-                                    sme_QosSearchInfo search_key, 
+                                    sme_QosSearchInfo search_key,
                                     sme_QosProcessSearchEntry fnp)
 {
    tListElem *pEntry= NULL, *pNextEntry = NULL;
@@ -6092,7 +6092,7 @@ eHalStatus sme_QosFindAllInFlowList(tpAniSirGlobal pMac,
    pEntry = csrLLPeekHead( &sme_QosCb.flow_list, VOS_FALSE );
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Flow List empty, can't search",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
@@ -6110,13 +6110,13 @@ eHalStatus sme_QosFindAllInFlowList(tpAniSirGlobal pMac,
             if(search_key.key.QosFlowID == flow_info->QosFlowID)
             {
                //msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: match found on flowID, ending search",
                          __func__, __LINE__);
                status = fnp(pMac, pEntry);
                if(eHAL_STATUS_FAILURE == status)
                {
-                  VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+                  VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                             "%s: %d: Failed to process entry",
                             __func__, __LINE__);
                   break;
@@ -6128,14 +6128,14 @@ eHalStatus sme_QosFindAllInFlowList(tpAniSirGlobal pMac,
             if(search_key.key.ac_type == flow_info->ac_type)
             {
                //msg
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: match found on ac, ending search",
                          __func__, __LINE__);
                flow_info->hoRenewal = pSession->ac_info[flow_info->ac_type].hoRenewal;
                status = fnp(pMac, pEntry);
                if(eHAL_STATUS_FAILURE == status)
                {
-                  VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+                  VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                             "%s: %d: Failed to process entry",
                             __func__, __LINE__);
                   break;
@@ -6151,20 +6151,20 @@ eHalStatus sme_QosFindAllInFlowList(tpAniSirGlobal pMac,
   \brief sme_QosIsACM() - Utility function to check if a particular AC
   mandates Admission Control.
   \param ac - Enumeration of the various EDCA Access Categories.
-  
+
   \return VOS_TRUE if the AC mandates Admission Control
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
-v_BOOL_t sme_QosIsACM(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, 
+v_BOOL_t sme_QosIsACM(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc,
                       sme_QosEdcaAcType ac, tDot11fBeaconIEs *pIes)
 {
    v_BOOL_t ret_val = VOS_FALSE;
    tDot11fBeaconIEs *pIesLocal;
    if(!pSirBssDesc)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: pSirBssDesc is NULL",
                 __func__, __LINE__);
       return VOS_FALSE;
@@ -6181,7 +6181,7 @@ v_BOOL_t sme_QosIsACM(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc,
       if (!HAL_STATUS_SUCCESS(csrGetParsedBssDescriptionIEs(pMac, pSirBssDesc, &pIesLocal)))
       {
          //err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: csrGetParsedBssDescriptionIEs() failed",
                    __func__, __LINE__);
          return VOS_FALSE;
@@ -6207,7 +6207,7 @@ v_BOOL_t sme_QosIsACM(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc,
              if(pIesLocal->WMMParams.acvo_acm) ret_val = VOS_TRUE;
              break;
           default:
-             VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+             VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                        "%s: %d: unknown AC = %d",
                        __func__, __LINE__, ac);
              //Assert
@@ -6215,7 +6215,7 @@ v_BOOL_t sme_QosIsACM(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc,
              break;
        }
    }//IS_QOS_BSS
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: ACM = %d for AC = %d",
              __func__, __LINE__, ret_val, ac );
    if (NULL == pIes)
@@ -6230,9 +6230,9 @@ v_BOOL_t sme_QosIsACM(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc,
   flows in flow_list, so that we can renew them after handoff is done.
 
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 static eHalStatus sme_QosBufferExistingFlows(tpAniSirGlobal pMac,
                                              v_U8_t sessionId)
@@ -6244,7 +6244,7 @@ static eHalStatus sme_QosBufferExistingFlows(tpAniSirGlobal pMac,
    pEntry = csrLLPeekHead( &sme_QosCb.flow_list, VOS_FALSE );
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Flow List empty, nothing to buffer",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
@@ -6276,7 +6276,7 @@ static eHalStatus sme_QosBufferExistingFlows(tpAniSirGlobal pMac,
             }
             if(!HAL_STATUS_SUCCESS(sme_QosBufferCmd(&cmd, VOS_TRUE)))
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                          "%s: %d: couldn't buffer the setup request for "
                          "flow %d in handoff state",
                          __func__, __LINE__,
@@ -6284,14 +6284,14 @@ static eHalStatus sme_QosBufferExistingFlows(tpAniSirGlobal pMac,
             }
             else
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: buffered a setup request for "
                          "flow %d in handoff state",
                          __func__, __LINE__,
                          flow_info->QosFlowID);
             }
          }
-         else if(SME_QOS_REASON_RELEASE == flow_info->reason ) 
+         else if(SME_QOS_REASON_RELEASE == flow_info->reason )
          {
             cmd.command = SME_QOS_RELEASE_REQ;
             cmd.pMac = pMac;
@@ -6299,7 +6299,7 @@ static eHalStatus sme_QosBufferExistingFlows(tpAniSirGlobal pMac,
             cmd.u.releaseCmdInfo.QosFlowID = flow_info->QosFlowID;
             if(!HAL_STATUS_SUCCESS(sme_QosBufferCmd(&cmd, VOS_TRUE)))
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                          "%s: %d: couldn't buffer the release request for "
                          "flow %d in handoff state",
                          __func__, __LINE__,
@@ -6307,7 +6307,7 @@ static eHalStatus sme_QosBufferExistingFlows(tpAniSirGlobal pMac,
             }
             else
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: buffered a release request for "
                          "flow %d in handoff state",
                          __func__, __LINE__,
@@ -6323,7 +6323,7 @@ static eHalStatus sme_QosBufferExistingFlows(tpAniSirGlobal pMac,
             cmd.u.modifyCmdInfo.QoSInfo = flow_info->QoSInfo;
             if(!HAL_STATUS_SUCCESS(sme_QosBufferCmd(&cmd, VOS_TRUE)))
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                          "%s: %d: couldn't buffer the modify request for "
                          "flow %d in handoff state",
                          __func__, __LINE__,
@@ -6331,7 +6331,7 @@ static eHalStatus sme_QosBufferExistingFlows(tpAniSirGlobal pMac,
             }
             else
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                          "%s: %d: buffered a modify request for "
                          "flow %d in handoff state",
                          __func__, __LINE__,
@@ -6339,7 +6339,7 @@ static eHalStatus sme_QosBufferExistingFlows(tpAniSirGlobal pMac,
             }
          }
          //delete the entry from Flow List
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                    "%s: %d: Deleting original entry at %p with flowID %d",
                    __func__, __LINE__,
                    flow_info, flow_info->QosFlowID);
@@ -6357,9 +6357,9 @@ static eHalStatus sme_QosBufferExistingFlows(tpAniSirGlobal pMac,
   flows in flow_list, if we lost connectivity.
 
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 static eHalStatus sme_QosDeleteExistingFlows(tpAniSirGlobal pMac,
                                              v_U8_t sessionId)
@@ -6385,7 +6385,7 @@ static eHalStatus sme_QosDeleteExistingFlows(tpAniSirGlobal pMac,
             (SME_QOS_REASON_RELEASE == flow_info->reason )||
             (SME_QOS_REASON_MODIFY == flow_info->reason ))
          {
-            flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+            flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                                    NULL,
                                    SME_QOS_STATUS_RELEASE_QOS_LOST_IND,
                                    flow_info->QosFlowID);
@@ -6407,33 +6407,33 @@ static eHalStatus sme_QosDeleteExistingFlows(tpAniSirGlobal pMac,
   release) from client while processing another one on the same AC.
   \param pcmd - a pointer to the cmd structure to be saved inside the buffered
                 cmd link list
-                
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosBufferCmd(sme_QosCmdInfo *pcmd, v_BOOL_t insert_head)
 {
    sme_QosSessionInfo *pSession;
    sme_QosCmdInfoEntry * pentry = NULL;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: Invoked",
              __func__, __LINE__);
    pentry = (sme_QosCmdInfoEntry *) vos_mem_malloc(sizeof(sme_QosCmdInfoEntry));
    if (!pentry)
    {
       //err msg
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Memory allocation failure",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
    }
    // copy the entire CmdInfo
    pentry->cmdInfo = *pcmd;
- 
+
    pSession = &sme_QosCb.sessionInfo[pcmd->sessionId];
-   if(insert_head) 
+   if(insert_head)
    {
       csrLLInsertHead(&pSession->bufferedCommandList, &pentry->link, VOS_TRUE);
    }
@@ -6444,13 +6444,13 @@ eHalStatus sme_QosBufferCmd(sme_QosCmdInfo *pcmd, v_BOOL_t insert_head)
    return eHAL_STATUS_SUCCESS;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosProcessBufferedCmd() - Utility function to process a buffered 
+  \brief sme_QosProcessBufferedCmd() - Utility function to process a buffered
   request (setup/modify/release) initially came from the client.
 
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 static eHalStatus sme_QosProcessBufferedCmd(v_U8_t sessionId)
 {
@@ -6459,7 +6459,7 @@ static eHalStatus sme_QosProcessBufferedCmd(v_U8_t sessionId)
    tListElem *pEntry= NULL;
    sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP;
    eHalStatus halStatus = eHAL_STATUS_SUCCESS;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: Invoked on session %d",
              __func__, __LINE__,
              sessionId);
@@ -6470,7 +6470,7 @@ static eHalStatus sme_QosProcessBufferedCmd(v_U8_t sessionId)
       if(!pEntry)
       {
          //Err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: no more buffered commands on session %d",
                    __func__, __LINE__,
                    sessionId);
@@ -6481,19 +6481,19 @@ static eHalStatus sme_QosProcessBufferedCmd(v_U8_t sessionId)
       switch(pcmd->cmdInfo.command)
       {
       case SME_QOS_SETUP_REQ:
-         hdd_status = sme_QosInternalSetupReq(pcmd->cmdInfo.pMac, 
+         hdd_status = sme_QosInternalSetupReq(pcmd->cmdInfo.pMac,
                                               pcmd->cmdInfo.sessionId,
                                               &pcmd->cmdInfo.u.setupCmdInfo.QoSInfo,
-                                              pcmd->cmdInfo.u.setupCmdInfo.QoSCallback, 
-                                              pcmd->cmdInfo.u.setupCmdInfo.HDDcontext, 
-                                              pcmd->cmdInfo.u.setupCmdInfo.UPType, 
-                                              pcmd->cmdInfo.u.setupCmdInfo.QosFlowID, 
+                                              pcmd->cmdInfo.u.setupCmdInfo.QoSCallback,
+                                              pcmd->cmdInfo.u.setupCmdInfo.HDDcontext,
+                                              pcmd->cmdInfo.u.setupCmdInfo.UPType,
+                                              pcmd->cmdInfo.u.setupCmdInfo.QosFlowID,
                                               VOS_TRUE,
                                               pcmd->cmdInfo.u.setupCmdInfo.hoRenewal);
          if(SME_QOS_STATUS_SETUP_FAILURE_RSP == hdd_status)
          {
             //Err msg
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: sme_QosInternalSetupReq failed on session %d",
                       __func__, __LINE__,
                       sessionId);
@@ -6501,13 +6501,13 @@ static eHalStatus sme_QosProcessBufferedCmd(v_U8_t sessionId)
          }
          break;
       case SME_QOS_RELEASE_REQ:
-         hdd_status = sme_QosInternalReleaseReq(pcmd->cmdInfo.pMac, 
+         hdd_status = sme_QosInternalReleaseReq(pcmd->cmdInfo.pMac,
                                                 pcmd->cmdInfo.u.releaseCmdInfo.QosFlowID,
                                                 VOS_TRUE);
          if(SME_QOS_STATUS_RELEASE_FAILURE_RSP == hdd_status)
          {
             //Err msg
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: sme_QosInternalReleaseReq failed on session %d",
                       __func__, __LINE__,
                       sessionId);
@@ -6515,14 +6515,14 @@ static eHalStatus sme_QosProcessBufferedCmd(v_U8_t sessionId)
          }
          break;
       case SME_QOS_MODIFY_REQ:
-         hdd_status = sme_QosInternalModifyReq(pcmd->cmdInfo.pMac, 
+         hdd_status = sme_QosInternalModifyReq(pcmd->cmdInfo.pMac,
                                                &pcmd->cmdInfo.u.modifyCmdInfo.QoSInfo,
                                                pcmd->cmdInfo.u.modifyCmdInfo.QosFlowID,
                                                VOS_TRUE);
          if(SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP == hdd_status)
          {
             //Err msg
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: sme_QosInternalModifyReq failed on session %d",
                       __func__, __LINE__,
                       sessionId);
@@ -6530,7 +6530,7 @@ static eHalStatus sme_QosProcessBufferedCmd(v_U8_t sessionId)
          }
          break;
       case SME_QOS_RESEND_REQ:
-         hdd_status = sme_QosReRequestAddTS(pcmd->cmdInfo.pMac, 
+         hdd_status = sme_QosReRequestAddTS(pcmd->cmdInfo.pMac,
                                             pcmd->cmdInfo.sessionId,
                                             &pcmd->cmdInfo.u.resendCmdInfo.QoSInfo,
                                             pcmd->cmdInfo.u.resendCmdInfo.ac,
@@ -6538,7 +6538,7 @@ static eHalStatus sme_QosProcessBufferedCmd(v_U8_t sessionId)
          if(SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP == hdd_status)
          {
             //Err msg
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: sme_QosReRequestAddTS failed on session %d",
                       __func__, __LINE__,
                       sessionId);
@@ -6547,7 +6547,7 @@ static eHalStatus sme_QosProcessBufferedCmd(v_U8_t sessionId)
          break;
       default:
          //err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: On session %d unknown cmd = %d",
                    __func__, __LINE__,
                    sessionId, pcmd->cmdInfo.command);
@@ -6560,7 +6560,7 @@ static eHalStatus sme_QosProcessBufferedCmd(v_U8_t sessionId)
    }
    else
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: cmd buffer empty",
                 __func__, __LINE__);
       pSession->readyForPowerSave = VOS_TRUE;
@@ -6572,9 +6572,9 @@ static eHalStatus sme_QosProcessBufferedCmd(v_U8_t sessionId)
   requests in the buffered_cmd_list, if we lost connectivity.
 
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 static eHalStatus sme_QosDeleteBufferedRequests(tpAniSirGlobal pMac,
                                                 v_U8_t sessionId)
@@ -6582,14 +6582,14 @@ static eHalStatus sme_QosDeleteBufferedRequests(tpAniSirGlobal pMac,
    sme_QosSessionInfo *pSession;
    sme_QosCmdInfoEntry *pcmd = NULL;
    tListElem *pEntry= NULL, *pNextEntry = NULL;
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: Invoked on session %d",
              __func__, __LINE__, sessionId);
    pSession = &sme_QosCb.sessionInfo[sessionId];
    pEntry = csrLLPeekHead( &pSession->bufferedCommandList, VOS_TRUE );
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
                 "%s: %d: Buffered List empty, nothing to delete on session %d",
                 __func__, __LINE__,
                 sessionId);
@@ -6598,7 +6598,7 @@ static eHalStatus sme_QosDeleteBufferedRequests(tpAniSirGlobal pMac,
    while( pEntry )
    {
       pNextEntry = csrLLNext( &pSession->bufferedCommandList, pEntry, VOS_TRUE );
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                 "%s: %d: deleting entry from buffered List",
                 __func__, __LINE__);
       //delete the entry from Flow List
@@ -6612,16 +6612,16 @@ static eHalStatus sme_QosDeleteBufferedRequests(tpAniSirGlobal pMac,
 }
 /*--------------------------------------------------------------------------
   \brief sme_QosSaveAssocInfo() - Utility function to save the assoc info in the
-  CB like BSS descritor of the AP, the profile that HDD sent down with the 
+  CB like BSS descritor of the AP, the profile that HDD sent down with the
   connect request, while CSR notifies for assoc/reassoc success.
-  \param pAssoc_info - pointer to the assoc structure to store the BSS descritor 
-                       of the AP, the profile that HDD sent down with the 
+  \param pAssoc_info - pointer to the assoc structure to store the BSS descritor
+                       of the AP, the profile that HDD sent down with the
                        connect request
-                       
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosSaveAssocInfo(sme_QosSessionInfo *pSession, sme_QosAssocInfo *pAssoc_info)
 {
@@ -6629,7 +6629,7 @@ eHalStatus sme_QosSaveAssocInfo(sme_QosSessionInfo *pSession, sme_QosAssocInfo *
    v_U32_t                bssLen = 0;
    if(NULL == pAssoc_info)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: pAssoc_info is NULL",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
@@ -6640,13 +6640,13 @@ eHalStatus sme_QosSaveAssocInfo(sme_QosSessionInfo *pSession, sme_QosAssocInfo *
       vos_mem_free(pSession->assocInfo.pBssDesc);
       pSession->assocInfo.pBssDesc = NULL;
    }
-   bssLen = pAssoc_info->pBssDesc->length + 
+   bssLen = pAssoc_info->pBssDesc->length +
       sizeof(pAssoc_info->pBssDesc->length);
    //save the bss Descriptor
    pBssDesc = (tSirBssDescription *)vos_mem_malloc(bssLen);
    if (!pBssDesc)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: couldn't allocate memory for the bss Descriptor",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
@@ -6663,15 +6663,15 @@ eHalStatus sme_QosSaveAssocInfo(sme_QosSessionInfo *pSession, sme_QosAssocInfo *
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosSetupFnp() - Utility function (pointer) to notify other entries 
+  \brief sme_QosSetupFnp() - Utility function (pointer) to notify other entries
   in FLOW list on the same AC that qos params got modified
   \param pMac - Pointer to the global MAC parameter structure.
   \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure)
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosSetupFnp(tpAniSirGlobal pMac, tListElem *pEntry)
 {
@@ -6682,7 +6682,7 @@ eHalStatus sme_QosSetupFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    sme_QosEdcaAcType ac;
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Entry is NULL",
                 __func__, __LINE__);
       //ASSERT
@@ -6695,12 +6695,12 @@ eHalStatus sme_QosSetupFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    pACInfo = &pSession->ac_info[ac];
    if(SME_QOS_REASON_REQ_SUCCESS == flow_info->reason)
    {
-      //notify HDD, only the other Flows running on the AC 
-      flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+      //notify HDD, only the other Flows running on the AC
+      flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                              &pACInfo->curr_QoSInfo[flow_info->tspec_mask - 1],
                              hdd_status,
                              flow_info->QosFlowID);
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Entry with flowID = %d getting notified",
                 __func__, __LINE__,
                 flow_info->QosFlowID);
@@ -6708,15 +6708,15 @@ eHalStatus sme_QosSetupFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    return eHAL_STATUS_SUCCESS;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosModificationNotifyFnp() - Utility function (pointer) to notify 
+  \brief sme_QosModificationNotifyFnp() - Utility function (pointer) to notify
   other entries in FLOW list on the same AC that qos params got modified
   \param pMac - Pointer to the global MAC parameter structure.
   \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure)
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosModificationNotifyFnp(tpAniSirGlobal pMac, tListElem *pEntry)
 {
@@ -6727,7 +6727,7 @@ eHalStatus sme_QosModificationNotifyFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    sme_QosEdcaAcType ac;
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Entry is NULL",
                 __func__, __LINE__);
       //ASSERT
@@ -6740,12 +6740,12 @@ eHalStatus sme_QosModificationNotifyFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    pACInfo = &pSession->ac_info[ac];
    if(SME_QOS_REASON_REQ_SUCCESS == flow_info->reason)
    {
-      //notify HDD, only the other Flows running on the AC 
-      flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+      //notify HDD, only the other Flows running on the AC
+      flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                              &pACInfo->curr_QoSInfo[flow_info->tspec_mask - 1],
                              hdd_status,
                              flow_info->QosFlowID);
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Entry with flowID = %d getting notified",
                 __func__, __LINE__,
                 flow_info->QosFlowID);
@@ -6753,22 +6753,22 @@ eHalStatus sme_QosModificationNotifyFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    return eHAL_STATUS_SUCCESS;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosModifyFnp() - Utility function (pointer) to delete the origianl 
+  \brief sme_QosModifyFnp() - Utility function (pointer) to delete the origianl
   entry in FLOW list & add the modified one
   \param pMac - Pointer to the global MAC parameter structure.
   \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure)
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosModifyFnp(tpAniSirGlobal pMac, tListElem *pEntry)
 {
    sme_QosFlowInfoEntry *flow_info = NULL;
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Entry is NULL",
                 __func__, __LINE__);
       VOS_ASSERT(0);
@@ -6783,7 +6783,7 @@ eHalStatus sme_QosModifyFnp(tpAniSirGlobal pMac, tListElem *pEntry)
       break;
    case SME_QOS_REASON_MODIFY:
       //delete the original entry from Flow List
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Deleting original entry at %p with flowID %d",
                 __func__, __LINE__,
                 flow_info, flow_info->QosFlowID);
@@ -6797,16 +6797,16 @@ eHalStatus sme_QosModifyFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    return eHAL_STATUS_SUCCESS;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosDelTsIndFnp() - Utility function (pointer) to find all Flows on 
-  the perticular AC & delete them, also send HDD indication through the callback 
+  \brief sme_QosDelTsIndFnp() - Utility function (pointer) to find all Flows on
+  the perticular AC & delete them, also send HDD indication through the callback
   it registered per request
   \param pMac - Pointer to the global MAC parameter structure.
   \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure)
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosDelTsIndFnp(tpAniSirGlobal pMac, tListElem *pEntry)
 {
@@ -6819,7 +6819,7 @@ eHalStatus sme_QosDelTsIndFnp(tpAniSirGlobal pMac, tListElem *pEntry)
 
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Entry is NULL",
                 __func__, __LINE__);
       //ASSERT
@@ -6844,7 +6844,7 @@ eHalStatus sme_QosDelTsIndFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    //Call the internal function for QoS release, adding a layer of abstraction
    status = sme_QosInternalReleaseReq(pMac, flow_info->QosFlowID, VOS_FALSE);
    sme_ReleaseGlobalLock( &pMac->sme );
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
              "%s: %d: QoS Release return status on Flow %d is %d",
              __func__, __LINE__,
              flow_info->QosFlowID, status);
@@ -6852,16 +6852,16 @@ eHalStatus sme_QosDelTsIndFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    return eHAL_STATUS_SUCCESS;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosReassocSuccessEvFnp() - Utility function (pointer) to notify HDD 
-  the success for the requested flow & notify all the other flows running on the 
+  \brief sme_QosReassocSuccessEvFnp() - Utility function (pointer) to notify HDD
+  the success for the requested flow & notify all the other flows running on the
   same AC that QoS params got modified
   \param pMac - Pointer to the global MAC parameter structure.
   \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure)
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosReassocSuccessEvFnp(tpAniSirGlobal pMac, tListElem *pEntry)
 {
@@ -6874,7 +6874,7 @@ eHalStatus sme_QosReassocSuccessEvFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    eHalStatus pmc_status = eHAL_STATUS_FAILURE;
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Entry is NULL",
                 __func__, __LINE__);
       //ASSERT
@@ -6916,7 +6916,7 @@ eHalStatus sme_QosReassocSuccessEvFnp(tpAniSirGlobal pMac, tListElem *pEntry)
 
             // if PMC doesn't return success right away means it is yet to put
             // the module in BMPS state & later to UAPSD state
-         
+
             if(eHAL_STATUS_FAILURE == pmc_status)
             {
                hdd_status = SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED;
@@ -6944,7 +6944,7 @@ eHalStatus sme_QosReassocSuccessEvFnp(tpAniSirGlobal pMac, tListElem *pEntry)
       flow_info->reason = SME_QOS_REASON_REQ_SUCCESS;
       if(pACInfo->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0].ts_info.psb)
       {
-   
+
          if(!pSession->uapsdAlreadyRequested)
          {
             if(!pMac->psOffloadEnabled)
@@ -6990,7 +6990,7 @@ eHalStatus sme_QosReassocSuccessEvFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    {
       if(!flow_info->hoRenewal)
       {
-         flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+         flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                                 &pACInfo->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0],
                                 hdd_status,
                                 flow_info->QosFlowID);
@@ -7003,7 +7003,7 @@ eHalStatus sme_QosReassocSuccessEvFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    else
    {
       //delete the entry from Flow List
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Deleting entry at %p with flowID %d",
                 __func__, __LINE__,
                 flow_info, flow_info->QosFlowID);
@@ -7011,26 +7011,26 @@ eHalStatus sme_QosReassocSuccessEvFnp(tpAniSirGlobal pMac, tListElem *pEntry)
       // reclaim the memory
       vos_mem_free(flow_info);
    }
-   
+
    return eHAL_STATUS_SUCCESS;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosAddTsFailureFnp() - Utility function (pointer), 
-  if the Addts request was for for an flow setup request, delete the entry from 
-  Flow list & notify HDD 
-  if the Addts request was for downgrading of QoS params because of an flow 
-  release requested on the AC, delete the entry from Flow list & notify HDD 
-  if the Addts request was for change of QoS params because of an flow 
-  modification requested on the AC, delete the new entry from Flow list & notify 
-  HDD 
+  \brief sme_QosAddTsFailureFnp() - Utility function (pointer),
+  if the Addts request was for for an flow setup request, delete the entry from
+  Flow list & notify HDD
+  if the Addts request was for downgrading of QoS params because of an flow
+  release requested on the AC, delete the entry from Flow list & notify HDD
+  if the Addts request was for change of QoS params because of an flow
+  modification requested on the AC, delete the new entry from Flow list & notify
+  HDD
 
   \param pMac - Pointer to the global MAC parameter structure.
   \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure)
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosAddTsFailureFnp(tpAniSirGlobal pMac, tListElem *pEntry)
 {
@@ -7042,7 +7042,7 @@ eHalStatus sme_QosAddTsFailureFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    sme_QosEdcaAcType ac;
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Entry is NULL",
                 __func__, __LINE__);
       //ASSERT
@@ -7078,24 +7078,24 @@ eHalStatus sme_QosAddTsFailureFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    }
    if(inform_hdd)
    {
-      //notify HDD, only the requested Flow, other Flows running on the AC stay 
+      //notify HDD, only the requested Flow, other Flows running on the AC stay
       // intact
       if(!flow_info->hoRenewal)
       {
-         flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+         flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                                 &pACInfo->curr_QoSInfo[pACInfo->tspec_pending - 1],
                                 hdd_status,
                                 flow_info->QosFlowID);
       }
       else
       {
-         flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+         flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                                 &pACInfo->curr_QoSInfo[pACInfo->tspec_pending - 1],
                                 SME_QOS_STATUS_RELEASE_QOS_LOST_IND,
                                 flow_info->QosFlowID);
       }
       //delete the entry from Flow List
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Deleting entry at %p with flowID %d",
                 __func__, __LINE__,
                 flow_info, flow_info->QosFlowID);
@@ -7106,23 +7106,23 @@ eHalStatus sme_QosAddTsFailureFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    return eHAL_STATUS_SUCCESS;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosAddTsSuccessFnp() - Utility function (pointer), 
+  \brief sme_QosAddTsSuccessFnp() - Utility function (pointer),
   if the Addts request was for for an flow setup request, notify HDD for success
-  for the flow & notify all the other flows running on the same AC that QoS 
+  for the flow & notify all the other flows running on the same AC that QoS
   params got modified
-  if the Addts request was for downgrading of QoS params because of an flow 
-  release requested on the AC, delete the entry from Flow list & notify HDD 
-  if the Addts request was for change of QoS params because of an flow 
-  modification requested on the AC, delete the old entry from Flow list & notify 
-  HDD for success for the flow & notify all the other flows running on the same 
+  if the Addts request was for downgrading of QoS params because of an flow
+  release requested on the AC, delete the entry from Flow list & notify HDD
+  if the Addts request was for change of QoS params because of an flow
+  modification requested on the AC, delete the old entry from Flow list & notify
+  HDD for success for the flow & notify all the other flows running on the same
   AC that QoS params got modified
   \param pMac - Pointer to the global MAC parameter structure.
   \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure)
-  
+
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosAddTsSuccessFnp(tpAniSirGlobal pMac, tListElem *pEntry)
 {
@@ -7138,7 +7138,7 @@ eHalStatus sme_QosAddTsSuccessFnp(tpAniSirGlobal pMac, tListElem *pEntry)
 
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Entry is NULL",
                 __func__, __LINE__);
       //ASSERT
@@ -7151,7 +7151,7 @@ eHalStatus sme_QosAddTsSuccessFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    pACInfo = &pSession->ac_info[ac];
    if(flow_info->tspec_mask != pACInfo->tspec_pending)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: No need to notify the HDD, the ADDTS "
                 "success is not for index = %d of the AC = %d",
                 __func__, __LINE__,
@@ -7261,7 +7261,7 @@ eHalStatus sme_QosAddTsSuccessFnp(tpAniSirGlobal pMac, tListElem *pEntry)
       }
       else
       {
-        if((pACInfo->num_flows[flow_info->tspec_mask - 1] == 1) && 
+        if((pACInfo->num_flows[flow_info->tspec_mask - 1] == 1) &&
            (SME_QOS_TSPEC_MASK_BIT_1_2_SET != pACInfo->tspec_mask_status))
         {
           // this is the only TSPEC active on this AC
@@ -7269,7 +7269,7 @@ eHalStatus sme_QosAddTsSuccessFnp(tpAniSirGlobal pMac, tListElem *pEntry)
           pSession->apsdMask &= ~(1 << (SME_QOS_EDCA_AC_VO - ac));
           //Also update modifyProfileFields.uapsd_mask in CSR for consistency
           csrGetModifyProfileFields(pMac, flow_info->sessionId, &modifyProfileFields);
-          modifyProfileFields.uapsd_mask = pSession->apsdMask; 
+          modifyProfileFields.uapsd_mask = pSession->apsdMask;
           csrSetModifyProfileFields(pMac, flow_info->sessionId, &modifyProfileFields);
           if(!pSession->apsdMask)
           {
@@ -7303,8 +7303,8 @@ eHalStatus sme_QosAddTsSuccessFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    {
       if(!flow_info->hoRenewal)
       {
-      
-         flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+
+         flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                                 &pACInfo->curr_QoSInfo[pACInfo->tspec_pending - 1],
                                 hdd_status,
                                 flow_info->QosFlowID);
@@ -7316,7 +7316,7 @@ eHalStatus sme_QosAddTsSuccessFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    }
    if(delete_entry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Deleting entry at %p with flowID %d",
                 __func__, __LINE__,
                 flow_info, flow_info->QosFlowID);
@@ -7329,17 +7329,17 @@ eHalStatus sme_QosAddTsSuccessFnp(tpAniSirGlobal pMac, tListElem *pEntry)
    return eHAL_STATUS_SUCCESS;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosIsRspPending() - Utility function to check if we are waiting 
+  \brief sme_QosIsRspPending() - Utility function to check if we are waiting
   for an AddTS or reassoc response on some AC other than the given AC
-  
+
   \param sessionId - Session we are interted in
   \param ac - Enumeration of the various EDCA Access Categories.
-  
+
   \return boolean
   TRUE - Response is pending on an AC
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 static v_BOOL_t sme_QosIsRspPending(v_U8_t sessionId, sme_QosEdcaAcType ac)
 {
@@ -7348,7 +7348,7 @@ static v_BOOL_t sme_QosIsRspPending(v_U8_t sessionId, sme_QosEdcaAcType ac)
    sme_QosEdcaAcType acIndex;
    v_BOOL_t status = VOS_FALSE;
    pSession = &sme_QosCb.sessionInfo[sessionId];
-   for(acIndex = SME_QOS_EDCA_AC_BE; acIndex < SME_QOS_EDCA_AC_MAX; acIndex++) 
+   for(acIndex = SME_QOS_EDCA_AC_BE; acIndex < SME_QOS_EDCA_AC_MAX; acIndex++)
    {
       if(acIndex == ac)
       {
@@ -7367,12 +7367,12 @@ static v_BOOL_t sme_QosIsRspPending(v_U8_t sessionId, sme_QosEdcaAcType ac)
   \brief sme_QosIsUapsdActive() - Function which can be called to determine
   if any sessions require PMC to be in U-APSD mode.
   \return boolean
-  
+
   Returns true if at least one session required PMC to be in U-APSD mode
   Returns false if no sessions require PMC to be in U-APSD mode
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 static v_BOOL_t sme_QosIsUapsdActive(void)
 {
@@ -7390,17 +7390,17 @@ static v_BOOL_t sme_QosIsUapsdActive(void)
    return VOS_FALSE;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_QosPmcFullPowerCallback() - Callback function registered with PMC 
+  \brief sme_QosPmcFullPowerCallback() - Callback function registered with PMC
   to notify SME-QoS when it puts the chip into full power
-  
+
   \param callbackContext - The context passed to PMC during pmcRequestFullPower
   call.
   \param status - eHalStatus returned by PMC.
-  
+
   \return None
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 void sme_QosPmcFullPowerCallback(void *callbackContext, eHalStatus status)
 {
@@ -7411,7 +7411,7 @@ void sme_QosPmcFullPowerCallback(void *callbackContext, eHalStatus status)
    }
    else
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: PMC failed to put the chip in Full power",
                 __func__, __LINE__);
       //ASSERT
@@ -7438,16 +7438,16 @@ void sme_QosPmcOffloadFullPowerCallback(void *callbackContext, tANI_U32 sessionI
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosPmcStartUAPSDCallback() - Callback function registered with PMC 
+  \brief sme_QosPmcStartUAPSDCallback() - Callback function registered with PMC
   to notify SME-QoS when it puts the chip into UAPSD mode
-  
+
   \param callbackContext - The context passed to PMC during pmcStartUapsd call.
   \param status - eHalStatus returned by PMC.
-  
+
   \return None
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 void sme_QosPmcStartUapsdCallback(void *callbackContext, eHalStatus status)
 {
@@ -7487,20 +7487,20 @@ void sme_QosPmcOffloadStartUapsdCallback(void *callbackContext,
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosPmcCheckRoutine() - Function registered with PMC to check with 
-  SME-QoS whenever the device is about to enter one of the power 
-  save modes. PMC runs a poll with all the registered modules if device can 
-  enter powersave mode or remain in full power  
-  
+  \brief sme_QosPmcCheckRoutine() - Function registered with PMC to check with
+  SME-QoS whenever the device is about to enter one of the power
+  save modes. PMC runs a poll with all the registered modules if device can
+  enter powersave mode or remain in full power
+
   \param callbackContext - The context passed to PMC during registration through
   pmcRegisterPowerSaveCheck.
   \return boolean
-  
-  SME-QOS returns PMC true or false respectively if it wants to vote for 
+
+  SME-QOS returns PMC true or false respectively if it wants to vote for
   entering power save or not
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 v_BOOL_t sme_QosPmcCheckRoutine(void *callbackContext)
 {
@@ -7533,24 +7533,24 @@ v_BOOL_t sme_QosPmcOffloadCheckRoutine(void *callbackContext, tANI_U32 sessionId
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosPmcDeviceStateUpdateInd() - Callback function registered with 
+  \brief sme_QosPmcDeviceStateUpdateInd() - Callback function registered with
   PMC to notify SME-QoS when it changes the power state
-  
-  \param callbackContext - The context passed to PMC during registration 
+
+  \param callbackContext - The context passed to PMC during registration
   through pmcRegisterDeviceStateUpdateInd.
   \param pmcState - Current power state that PMC moved into.
-  
+
   \return None
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 void sme_QosPmcDeviceStateUpdateInd(void *callbackContext, tPmcState pmcState)
 {
    eHalStatus status = eHAL_STATUS_FAILURE;
    tpAniSirGlobal pMac = PMAC_STRUCT( callbackContext );
    //check all the entries in Flow list for non-zero service interval, which will
-   //tell us if we need to notify HDD when PMC is out of UAPSD mode or going 
+   //tell us if we need to notify HDD when PMC is out of UAPSD mode or going
    // back to UAPSD mode
    switch(pmcState)
    {
@@ -7562,14 +7562,14 @@ void sme_QosPmcDeviceStateUpdateInd(void *callbackContext, tPmcState pmcState)
       break;
    default:
       status = eHAL_STATUS_SUCCESS;
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: nothing to process in PMC state %d",
                 __func__, __LINE__,
                 pmcState);
    }
    if(!HAL_STATUS_SUCCESS(status))
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: ignoring Device(PMC) state change to %d",
                 __func__, __LINE__,
                 pmcState);
@@ -7613,25 +7613,25 @@ void sme_OffloadQosPmcDeviceStateUpdateInd(void *callbackContext,
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosProcessOutOfUapsdMode() - Function to notify HDD when PMC 
+  \brief sme_QosProcessOutOfUapsdMode() - Function to notify HDD when PMC
   notifies SME-QoS that it moved out of UAPSD mode to FULL power
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessOutOfUapsdMode(tpAniSirGlobal pMac)
 {
    sme_QosSessionInfo *pSession;
    tListElem *pEntry= NULL, *pNextEntry = NULL;
    sme_QosFlowInfoEntry *flow_info = NULL;
-   
+
    pEntry = csrLLPeekHead( &sme_QosCb.flow_list, VOS_FALSE );
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                 "%s: %d: Flow List empty, can't search",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
@@ -7646,7 +7646,7 @@ eHalStatus sme_QosProcessOutOfUapsdMode(tpAniSirGlobal pMac)
           flow_info->QoSInfo.min_service_interval) &&
          (SME_QOS_REASON_REQ_SUCCESS == flow_info->reason))
       {
-         flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+         flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                                 &pSession->ac_info[flow_info->ac_type].curr_QoSInfo[flow_info->tspec_mask - 1],
                                 SME_QOS_STATUS_OUT_OF_APSD_POWER_MODE_IND,
                                 flow_info->QosFlowID);
@@ -7694,14 +7694,14 @@ eHalStatus sme_OffloadQosProcessOutOfUapsdMode(tpAniSirGlobal pMac,
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosProcessIntoUapsdMode() - Function to notify HDD when PMC 
-  notifies SME-QoS that it is moving into UAPSD mode 
-  
+  \brief sme_QosProcessIntoUapsdMode() - Function to notify HDD when PMC
+  notifies SME-QoS that it is moving into UAPSD mode
+
   \param pMac - Pointer to the global MAC parameter structure.
   \return eHalStatus
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_QosProcessIntoUapsdMode(tpAniSirGlobal pMac)
 {
@@ -7712,7 +7712,7 @@ eHalStatus sme_QosProcessIntoUapsdMode(tpAniSirGlobal pMac)
    pEntry = csrLLPeekHead( &sme_QosCb.flow_list, VOS_FALSE );
    if(!pEntry)
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Flow List empty, can't search",
                 __func__, __LINE__);
       return eHAL_STATUS_FAILURE;
@@ -7726,7 +7726,7 @@ eHalStatus sme_QosProcessIntoUapsdMode(tpAniSirGlobal pMac)
       if( (flow_info->QoSInfo.ts_info.psb) &&
          (SME_QOS_REASON_REQ_SUCCESS == flow_info->reason) )
       {
-         flow_info->QoSCallback(pMac, flow_info->HDDcontext, 
+         flow_info->QoSCallback(pMac, flow_info->HDDcontext,
                                 &pSession->ac_info[flow_info->ac_type].curr_QoSInfo[flow_info->tspec_mask - 1],
                                 SME_QOS_STATUS_INTO_APSD_POWER_MODE_IND,
                                 flow_info->QosFlowID);
@@ -7778,12 +7778,12 @@ void sme_QosCleanupCtrlBlkForHandoff(tpAniSirGlobal pMac, v_U8_t sessionId)
    sme_QosACInfo *pACInfo;
    sme_QosEdcaAcType ac;
    pSession = &sme_QosCb.sessionInfo[sessionId];
-   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
    {
       pACInfo = &pSession->ac_info[ac];
-      vos_mem_zero(pACInfo->curr_QoSInfo, 
+      vos_mem_zero(pACInfo->curr_QoSInfo,
                    sizeof(sme_QosWmmTspecInfo) * SME_QOS_TSPEC_INDEX_MAX);
-      vos_mem_zero(pACInfo->requested_QoSInfo, 
+      vos_mem_zero(pACInfo->requested_QoSInfo,
                    sizeof(sme_QosWmmTspecInfo) * SME_QOS_TSPEC_INDEX_MAX);
       pACInfo->num_flows[0] = 0;
       pACInfo->num_flows[1] = 0;
@@ -7796,19 +7796,19 @@ void sme_QosCleanupCtrlBlkForHandoff(tpAniSirGlobal pMac, v_U8_t sessionId)
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_QosIsTSInfoAckPolicyValid() - The SME QoS API exposed to HDD to 
-  check if TS info ack policy field can be set to "HT-immediate block acknowledgement" 
-  
+  \brief sme_QosIsTSInfoAckPolicyValid() - The SME QoS API exposed to HDD to
+  check if TS info ack policy field can be set to "HT-immediate block acknowledgement"
+
   \param pMac - The handle returned by macOpen.
   \param pQoSInfo - Pointer to sme_QosWmmTspecInfo which contains the WMM TSPEC
                     related info, provided by HDD
   \param sessionId - sessionId returned by sme_OpenSession.
-  
+
   \return VOS_TRUE - Current Association is HT association and so TS info ack policy
                      can be set to "HT-immediate block acknowledgement"
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 v_BOOL_t sme_QosIsTSInfoAckPolicyValid(tpAniSirGlobal pMac,
     sme_QosWmmTspecInfo * pQoSInfo,
@@ -7819,7 +7819,7 @@ v_BOOL_t sme_QosIsTSInfoAckPolicyValid(tpAniSirGlobal pMac,
   eHalStatus hstatus;
   if( !CSR_IS_SESSION_VALID( pMac, sessionId ) )
   {
-     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                "%s: %d: Session Id %d is invalid",
                __func__, __LINE__,
                sessionId);
@@ -7830,7 +7830,7 @@ v_BOOL_t sme_QosIsTSInfoAckPolicyValid(tpAniSirGlobal pMac,
 
   if( !pSession->sessionActive )
   {
-     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                "%s: %d: Session %d is inactive",
                __func__, __LINE__,
                sessionId);
@@ -7839,7 +7839,7 @@ v_BOOL_t sme_QosIsTSInfoAckPolicyValid(tpAniSirGlobal pMac,
 
   if(!pSession->assocInfo.pBssDesc)
   {
-     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+     VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                "%s: %d: Session %d has an Invalid BSS Descriptor",
                __func__, __LINE__,
                sessionId);
@@ -7863,11 +7863,11 @@ v_BOOL_t sme_QosIsTSInfoAckPolicyValid(tpAniSirGlobal pMac,
   if(!pIes->HTCaps.present &&
      pQoSInfo->ts_info.ack_policy == SME_QOS_WMM_TS_ACK_POLICY_HT_IMMEDIATE_BLOCK_ACK)
   {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: On session %d HT Caps aren't present but application set ack policy to HT ",
                 __func__, __LINE__,
                 sessionId);
-      
+
       vos_mem_free(pIes);
       return VOS_FALSE;
   }
@@ -7993,7 +7993,7 @@ sme_QosStatusType sme_QosTriggerUapsdChange( tpAniSirGlobal pMac )
 {
    sme_QosSessionInfo *pSession;
    sme_QosACInfo *pACInfo;
-   v_U8_t ac, tspec1 = 0, tspec2 = 0; 
+   v_U8_t ac, tspec1 = 0, tspec2 = 0;
    v_U8_t uapsd_mask;
    tDot11fBeaconIEs *pIesLocal;
    v_U8_t acm_mask;
@@ -8021,7 +8021,7 @@ sme_QosStatusType sme_QosTriggerUapsdChange( tpAniSirGlobal pMac )
          vos_mem_free(pIesLocal);
          // get the uapsd mask for this session
          uapsd_mask = pSession->apsdMask;
-         // unmask the bits with ACM on to avoid reassoc on them 
+         // unmask the bits with ACM on to avoid reassoc on them
          uapsd_mask &= ~acm_mask;
          // iterate through the ACs to determine if we need to re-add any TSPECs
          for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
@@ -8063,7 +8063,7 @@ sme_QosStatusType sme_QosTriggerUapsdChange( tpAniSirGlobal pMac )
                      //double check whether we need to do anything
                      if( fIsUapsdNeeded )
                      {
-                        pACInfo->requested_QoSInfo[tspec1 - 1] = 
+                        pACInfo->requested_QoSInfo[tspec1 - 1] =
                            pACInfo->curr_QoSInfo[tspec1 - 1];
                         sme_QosReRequestAddTS( pMac, sessionId,
                                                &pACInfo->requested_QoSInfo[tspec1 - 1],
@@ -8079,7 +8079,7 @@ sme_QosStatusType sme_QosTriggerUapsdChange( tpAniSirGlobal pMac )
                         {
                            //No need to inform HDD
                            //pACInfo->hoRenewal = VOS_TRUE;
-                           pACInfo->requested_QoSInfo[tspec2 - 1] = 
+                           pACInfo->requested_QoSInfo[tspec2 - 1] =
                               pACInfo->curr_QoSInfo[tspec2 - 1];
                            sme_QosReRequestAddTS( pMac, sessionId,
                                                   &pACInfo->requested_QoSInfo[tspec2 - 1],
@@ -8118,14 +8118,14 @@ sme_QosStatusType sme_QosTriggerUapsdChange( tpAniSirGlobal pMac )
          if(uapsd_mask)
          {
             tCsrRoamModifyProfileFields modifyProfileFields;
-            //we need to do a reassoc on these AC 
+            //we need to do a reassoc on these AC
             csrGetModifyProfileFields(pMac, sessionId, &modifyProfileFields);
             if( btcIsReadyForUapsd(pMac) )
             {
                modifyProfileFields.uapsd_mask = uapsd_mask;
             }
             else
-            {  
+            {
                modifyProfileFields.uapsd_mask = 0;
             }
             //Do we need to inform HDD?
@@ -8175,9 +8175,9 @@ static sme_QosStatusType sme_QosReRequestAddTS(tpAniSirGlobal pMac,
    //call PMC's request for power function
    // AND
    //another check is added considering the flowing scenario
-   //Addts reqest is pending on one AC, while APSD requested on another which 
-   //needs a reassoc. Will buffer a request if Addts is pending on any AC, 
-   //which will safegaurd the above scenario, & also won't confuse PE with back 
+   //Addts reqest is pending on one AC, while APSD requested on another which
+   //needs a reassoc. Will buffer a request if Addts is pending on any AC,
+   //which will safegaurd the above scenario, & also won't confuse PE with back
    //to back Addts or Addts followed by Reassoc
    if(!pMac->psOffloadEnabled)
    {
@@ -8267,7 +8267,7 @@ static sme_QosStatusType sme_QosReRequestAddTS(tpAniSirGlobal pMac,
             // so vote powersave back on
             pSession->readyForPowerSave = VOS_TRUE;
          }
-         if(SME_QOS_STATUS_SETUP_REQ_PENDING_RSP == status) 
+         if(SME_QOS_STATUS_SETUP_REQ_PENDING_RSP == status)
          {
             status = SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP;
             pACInfo->tspec_pending = tspecMask;
@@ -8276,16 +8276,16 @@ static sme_QosStatusType sme_QosReRequestAddTS(tpAniSirGlobal pMac,
                  (SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY == status) ||
                  (SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_PENDING == status))
          {
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: UAPSD is setup already status = %d "
                       "returned by sme_QosSetup",
                       __func__, __LINE__,
-                      status);  
+                      status);
          }
          else
          {
             //err msg
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                       "%s: %d: unexpected status = %d returned by sme_QosSetup",
                       __func__, __LINE__,
                       status);
@@ -8294,7 +8294,7 @@ static sme_QosStatusType sme_QosReRequestAddTS(tpAniSirGlobal pMac,
       break;
    case SME_QOS_HANDOFF:
    case SME_QOS_REQUESTED:
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: Re-Add request in state = %d  buffer the request",
                 __func__, __LINE__,
                 pACInfo->curr_state);
@@ -8306,7 +8306,7 @@ static sme_QosStatusType sme_QosReRequestAddTS(tpAniSirGlobal pMac,
       cmd.u.resendCmdInfo.QoSInfo = *pQoSInfo;
       if(!HAL_STATUS_SUCCESS(sme_QosBufferCmd(&cmd, VOS_FALSE)))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "%s: %d: couldn't buffer the readd request in state = %d",
                    __func__, __LINE__,
                    pACInfo->curr_state );
@@ -8321,8 +8321,8 @@ static sme_QosStatusType sme_QosReRequestAddTS(tpAniSirGlobal pMac,
    case SME_QOS_INIT:
    case SME_QOS_LINK_UP:
    default:
-      //print error msg, 
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      //print error msg,
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                 "%s: %d: ReAdd request in unexpected state = %d",
                 __func__, __LINE__,
                 pACInfo->curr_state );
@@ -8333,7 +8333,7 @@ static sme_QosStatusType sme_QosReRequestAddTS(tpAniSirGlobal pMac,
       break;
    }
    if((SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP == status) ||
-      (SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_APSD_SET_ALREADY == status)) 
+      (SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_APSD_SET_ALREADY == status))
    {
       (void)sme_QosProcessBufferedCmd(sessionId);
    }
@@ -8345,7 +8345,7 @@ static void sme_QosInitACs(tpAniSirGlobal pMac, v_U8_t sessionId)
    sme_QosSessionInfo *pSession;
    sme_QosEdcaAcType ac;
    pSession = &sme_QosCb.sessionInfo[sessionId];
-   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+   for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
    {
       vos_mem_zero(&pSession->ac_info[ac], sizeof(sme_QosACInfo));
       sme_QosStateTransition(sessionId, ac, SME_QOS_INIT);
@@ -8369,10 +8369,10 @@ static eHalStatus sme_QosRequestReassoc(tpAniSirGlobal pMac, tANI_U8 sessionId,
       //Update the state to Handoff so subsequent requests are queued until
       // this one is finished
       sme_QosEdcaAcType ac;
-      for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) 
+      for(ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++)
       {
          pACInfo = &pSession->ac_info[ac];
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                    "%s: %d: AC[%d] is in state [%d]",
                    __func__, __LINE__,
                    ac, pACInfo->curr_state );
@@ -8395,7 +8395,7 @@ static v_U32_t sme_QosAssignFlowId(void)
    {
       // The Flow ID wrapped.  This is obviously not a real life scenario
       // but handle it to keep the software test folks happy
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
                 "%s: %d: Software Test made the flow counter wrap, "
                 "QoS may no longer be functional",
                 __func__, __LINE__);
diff --git a/CORE/SME/src/btc/btcApi.c b/CORE/SME/src/btc/btcApi.c
index d591acb9366e..4b5169d14ed1 100644
--- a/CORE/SME/src/btc/btcApi.c
+++ b/CORE/SME/src/btc/btcApi.c
@@ -499,7 +499,7 @@ VOS_STATUS btcSetConfig (tHalHandle hHal, tpSmeBtcConfig pSmeBtcConfig)
    {
       if(VOS_STATUS_SUCCESS != btcSendCfgMsg(hHal, pSmeBtcConfig))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
             "Failure to send BTC config down");
          return VOS_STATUS_E_FAILURE;
       }
@@ -583,7 +583,7 @@ VOS_STATUS btcGetConfig (tHalHandle hHal, tpSmeBtcConfig pSmeBtcConfig)
                     pointer to caller alocated buffer containing the BD address to find a match
            handle - BT_INVALID_CONN_HANDLE == not care
                     otherwise, a handle to match
-    NOPTE: Either bdAddr or handle can be valid, if both of them are valid, use bdAddr only. If neither 
+    NOPTE: Either bdAddr or handle can be valid, if both of them are valid, use bdAddr only. If neither
            bdAddr nor handle is valid, return the next free slot.
 */
 static tpSmeBtAclEventHist btcFindAclEventHist( tpAniSirGlobal pMac, v_U8_t *bdAddr, v_U16_t handle )
@@ -642,7 +642,7 @@ static tpSmeBtAclEventHist btcFindAclEventHist( tpAniSirGlobal pMac, v_U8_t *bdA
                     pointer to caller alocated buffer containing the BD address to find a match
            handle - BT_INVALID_CONN_HANDLE == not care
                     otherwise, a handle to match
-    NOPTE: Either bdAddr or handle can be valid, if both of them are valid, use bdAddr only. If neither 
+    NOPTE: Either bdAddr or handle can be valid, if both of them are valid, use bdAddr only. If neither
            bdAddr nor handle is valid, return the next free slot.
 */
 static tpSmeBtSyncEventHist btcFindSyncEventHist( tpAniSirGlobal pMac, v_U8_t *bdAddr, v_U16_t handle )
@@ -697,7 +697,7 @@ static tpSmeBtSyncEventHist btcFindSyncEventHist( tpAniSirGlobal pMac, v_U8_t *b
 
 /*
     btcFindDisconnEventHist find a slot for the deferred disconnect event
-    If handle is invlid, it returns a free slot, if any. 
+    If handle is invlid, it returns a free slot, if any.
     If handle is valid, it tries to find a match first in case same disconnect event comes down again.
 */
 static tpSmeBtDisconnectEventHist btcFindDisconnEventHist( tpAniSirGlobal pMac, v_U16_t handle )
@@ -734,7 +734,7 @@ static tpSmeBtDisconnectEventHist btcFindDisconnEventHist( tpAniSirGlobal pMac,
 
 /*
     btcFindModeChangeEventHist find a slot for the deferred mopde change event
-    If handle is invalid, it returns a free slot, if any. 
+    If handle is invalid, it returns a free slot, if any.
     If handle is valid, it tries to find a match first in case same disconnect event comes down again.
 */
 tpSmeBtAclModeChangeEventHist btcFindModeChangeEventHist( tpAniSirGlobal pMac, v_U16_t handle )
@@ -771,7 +771,7 @@ tpSmeBtAclModeChangeEventHist btcFindModeChangeEventHist( tpAniSirGlobal pMac, v
 
 /*
     btcFindSyncUpdateEventHist find a slot for the deferred SYNC_UPDATE event
-    If handle is invalid, it returns a free slot, if any. 
+    If handle is invalid, it returns a free slot, if any.
     If handle is valid, it tries to find a match first in case same disconnect event comes down again.
 */
 tpSmeBtSyncUpdateHist btcFindSyncUpdateEventHist( tpAniSirGlobal pMac, v_U16_t handle )
@@ -825,7 +825,7 @@ static void btcReleaseSyncEventHist( tpAniSirGlobal pMac, tpSmeBtSyncEventHist p
 /*To defer a ACL creation event
     We only support one ACL per BD address.
     If the last cached event another ACL create event, replace that event with the new event
-    If a completion event with success status code, and the new ACL creation 
+    If a completion event with success status code, and the new ACL creation
     on same address, defer a new disconnect event(fake one), then cache this ACL creation event.
     Otherwise, save this create event.
 */
@@ -837,7 +837,7 @@ static VOS_STATUS btcDeferAclCreate( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
     do
     {
         //Find a match
-        pAclEventHist = btcFindAclEventHist( pMac, pEvent->uEventParam.btAclConnection.bdAddr, 
+        pAclEventHist = btcFindAclEventHist( pMac, pEvent->uEventParam.btAclConnection.bdAddr,
                                     BT_INVALID_CONN_HANDLE );
         if( NULL == pAclEventHist )
         {
@@ -846,7 +846,7 @@ static VOS_STATUS btcDeferAclCreate( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
             pAclEventHist = btcFindAclEventHist( pMac, NULL, BT_INVALID_CONN_HANDLE );
             if( NULL != pAclEventHist )
             {
-                vos_mem_copy(&pAclEventHist->btAclConnection[0], &pEvent->uEventParam.btAclConnection, 
+                vos_mem_copy(&pAclEventHist->btAclConnection[0], &pEvent->uEventParam.btAclConnection,
                                 sizeof(tSmeBtAclConnectionParam));
                 pAclEventHist->btEventType[0] = BT_EVENT_CREATE_ACL_CONNECTION;
                 pAclEventHist->bNextEventIdx = 1;
@@ -882,14 +882,14 @@ static VOS_STATUS btcDeferAclCreate( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
                 //done
                 break;
             }
-            else if(BT_EVENT_ACL_CONNECTION_COMPLETE == 
+            else if(BT_EVENT_ACL_CONNECTION_COMPLETE ==
                         pAclEventHist->btEventType[pAclEventHist->bNextEventIdx - 1])
             {
                 //The last cached event is completion, check the status.
                 if(BT_CONN_STATUS_SUCCESS == pAclEvent->status)
                 {
                     tSmeBtEvent btEvent;
-                    //The last event we have is success completion event. 
+                    //The last event we have is success completion event.
                     //Should not get a creation event before creation.
                     smsLog(pMac, LOGE, FL("  Missing disconnect event on handle %d"), pAclEvent->connectionHandle);
                     //Fake a disconnect event
@@ -902,8 +902,8 @@ static VOS_STATUS btcDeferAclCreate( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
             if(pAclEventHist->bNextEventIdx < BT_MAX_NUM_EVENT_ACL_DEFERRED)
             {
                 pAclEventHist->btEventType[pAclEventHist->bNextEventIdx] = BT_EVENT_CREATE_ACL_CONNECTION;
-                vos_mem_copy(&pAclEventHist->btAclConnection[pAclEventHist->bNextEventIdx], 
-                                &pEvent->uEventParam.btAclConnection, 
+                vos_mem_copy(&pAclEventHist->btAclConnection[pAclEventHist->bNextEventIdx],
+                                &pEvent->uEventParam.btAclConnection,
                                 sizeof(tSmeBtAclConnectionParam));
                 pAclEventHist->bNextEventIdx++;
             }
@@ -929,7 +929,7 @@ static VOS_STATUS btcDeferAclComplete( tpAniSirGlobal pMac, tpSmeBtEvent pEvent
     do
     {
         //Find a match
-        pAclEventHist = btcFindAclEventHist( pMac, pEvent->uEventParam.btAclConnection.bdAddr, 
+        pAclEventHist = btcFindAclEventHist( pMac, pEvent->uEventParam.btAclConnection.bdAddr,
                                     BT_INVALID_CONN_HANDLE );
         if(pAclEventHist)
         {
@@ -944,7 +944,7 @@ static VOS_STATUS btcDeferAclComplete( tpAniSirGlobal pMac, tpSmeBtEvent pEvent
                 //If completion fails, and the last one is creation, remove the creation event
                 if(BT_EVENT_CREATE_ACL_CONNECTION == pAclEventHist->btEventType[pAclEventHist->bNextEventIdx-1])
                 {
-                    vos_mem_zero(&pAclEventHist->btAclConnection[pAclEventHist->bNextEventIdx-1], 
+                    vos_mem_zero(&pAclEventHist->btAclConnection[pAclEventHist->bNextEventIdx-1],
                                     sizeof(tSmeBtAclConnectionParam));
                     pAclEventHist->bNextEventIdx--;
                     //Done with this event
@@ -967,8 +967,8 @@ static VOS_STATUS btcDeferAclComplete( tpAniSirGlobal pMac, tpSmeBtEvent pEvent
             {
                 //Save this event
                 pAclEventHist->btEventType[pAclEventHist->bNextEventIdx] = BT_EVENT_ACL_CONNECTION_COMPLETE;
-                vos_mem_copy(&pAclEventHist->btAclConnection[pAclEventHist->bNextEventIdx], 
-                                &pEvent->uEventParam.btAclConnection, 
+                vos_mem_copy(&pAclEventHist->btAclConnection[pAclEventHist->bNextEventIdx],
+                                &pEvent->uEventParam.btAclConnection,
                                 sizeof(tSmeBtAclConnectionParam));
                 pAclEventHist->bNextEventIdx++;
             }
@@ -991,9 +991,9 @@ static VOS_STATUS btcDeferAclComplete( tpAniSirGlobal pMac, tpSmeBtEvent pEvent
 }
 
 /*To defer a SYNC creation event
-    If the last cached event is another SYNC create event, replace 
+    If the last cached event is another SYNC create event, replace
     that event with the new event.
-    If there is a completion event with success status code, cache a new 
+    If there is a completion event with success status code, cache a new
     disconnect event(fake) first, then cache this SYNC creation event.
     Otherwise, cache this create event.
 */
@@ -1005,7 +1005,7 @@ static VOS_STATUS btcDeferSyncCreate( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
     do
     {
         //Find a match
-        pSyncEventHist = btcFindSyncEventHist( pMac, pEvent->uEventParam.btSyncConnection.bdAddr, 
+        pSyncEventHist = btcFindSyncEventHist( pMac, pEvent->uEventParam.btSyncConnection.bdAddr,
                                     BT_INVALID_CONN_HANDLE );
         if( NULL == pSyncEventHist )
         {
@@ -1014,7 +1014,7 @@ static VOS_STATUS btcDeferSyncCreate( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
             pSyncEventHist = btcFindSyncEventHist( pMac, NULL, BT_INVALID_CONN_HANDLE );
             if( NULL != pSyncEventHist )
             {
-                vos_mem_copy(&pSyncEventHist->btSyncConnection[0], &pEvent->uEventParam.btSyncConnection, 
+                vos_mem_copy(&pSyncEventHist->btSyncConnection[0], &pEvent->uEventParam.btSyncConnection,
                                 sizeof(tSmeBtSyncConnectionParam));
                 pSyncEventHist->btEventType[0] = BT_EVENT_CREATE_SYNC_CONNECTION;
                 pSyncEventHist->bNextEventIdx = 1;
@@ -1038,7 +1038,7 @@ static VOS_STATUS btcDeferSyncCreate( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
                 return status;
             }
             pSyncEvent = &pSyncEventHist->btSyncConnection[pSyncEventHist->bNextEventIdx - 1];
-            if(BT_EVENT_CREATE_SYNC_CONNECTION == 
+            if(BT_EVENT_CREATE_SYNC_CONNECTION ==
                 pSyncEventHist->btEventType[pSyncEventHist->bNextEventIdx - 1])
             {
                 //The last cached event is creation, replace it with the new one
@@ -1051,14 +1051,14 @@ static VOS_STATUS btcDeferSyncCreate( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
                 //done
                 break;
             }
-            else if(BT_EVENT_SYNC_CONNECTION_COMPLETE == 
+            else if(BT_EVENT_SYNC_CONNECTION_COMPLETE ==
                         pSyncEventHist->btEventType[pSyncEventHist->bNextEventIdx - 1])
             {
                 //The last cached event is completion, check the status.
                 if(BT_CONN_STATUS_SUCCESS == pSyncEvent->status)
                 {
                     tSmeBtEvent btEvent;
-                    //The last event we have is success completion event. 
+                    //The last event we have is success completion event.
                     //Should not get a creation event before creation.
                     smsLog(pMac, LOGE, FL("  Missing disconnect event on handle %d"), pSyncEvent->connectionHandle);
                     //Fake a disconnect event
@@ -1071,8 +1071,8 @@ static VOS_STATUS btcDeferSyncCreate( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
             if(pSyncEventHist->bNextEventIdx < BT_MAX_NUM_EVENT_SCO_DEFERRED)
             {
                 pSyncEventHist->btEventType[pSyncEventHist->bNextEventIdx] = BT_EVENT_CREATE_SYNC_CONNECTION;
-                vos_mem_copy(&pSyncEventHist->btSyncConnection[pSyncEventHist->bNextEventIdx], 
-                                &pEvent->uEventParam.btSyncConnection, 
+                vos_mem_copy(&pSyncEventHist->btSyncConnection[pSyncEventHist->bNextEventIdx],
+                                &pEvent->uEventParam.btSyncConnection,
                                 sizeof(tSmeBtSyncConnectionParam));
                 pSyncEventHist->bNextEventIdx++;
             }
@@ -1088,7 +1088,7 @@ static VOS_STATUS btcDeferSyncCreate( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
 /*Defer a SYNC completion event
   If there is cached event on this BD address, check completion status.
   If status is fail and last cached event is creation, remove te creation event and drop
-  this completion event. 
+  this completion event.
   Otherwise, cache this completion event as the latest one.
 */
 static VOS_STATUS btcDeferSyncComplete( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
@@ -1098,7 +1098,7 @@ static VOS_STATUS btcDeferSyncComplete( tpAniSirGlobal pMac, tpSmeBtEvent pEvent
     do
     {
         //Find a match
-        pSyncEventHist = btcFindSyncEventHist( pMac, pEvent->uEventParam.btSyncConnection.bdAddr, 
+        pSyncEventHist = btcFindSyncEventHist( pMac, pEvent->uEventParam.btSyncConnection.bdAddr,
                                     BT_INVALID_CONN_HANDLE );
         if(pSyncEventHist)
         {
@@ -1113,7 +1113,7 @@ static VOS_STATUS btcDeferSyncComplete( tpAniSirGlobal pMac, tpSmeBtEvent pEvent
                 //If completion fails, and the last one is creation, remove the creation event
                 if(BT_EVENT_CREATE_SYNC_CONNECTION == pSyncEventHist->btEventType[pSyncEventHist->bNextEventIdx-1])
                 {
-                    vos_mem_zero(&pSyncEventHist->btSyncConnection[pSyncEventHist->bNextEventIdx-1], 
+                    vos_mem_zero(&pSyncEventHist->btSyncConnection[pSyncEventHist->bNextEventIdx-1],
                                     sizeof(tSmeBtSyncConnectionParam));
                     pSyncEventHist->bNextEventIdx--;
                     //Done with this event
@@ -1137,8 +1137,8 @@ static VOS_STATUS btcDeferSyncComplete( tpAniSirGlobal pMac, tpSmeBtEvent pEvent
             {
                 //Save this event
                 pSyncEventHist->btEventType[pSyncEventHist->bNextEventIdx] = BT_EVENT_SYNC_CONNECTION_COMPLETE;
-                vos_mem_copy(&pSyncEventHist->btSyncConnection[pSyncEventHist->bNextEventIdx], 
-                                &pEvent->uEventParam.btSyncConnection, 
+                vos_mem_copy(&pSyncEventHist->btSyncConnection[pSyncEventHist->bNextEventIdx],
+                                &pEvent->uEventParam.btSyncConnection,
                                 sizeof(tSmeBtSyncConnectionParam));
                 pSyncEventHist->bNextEventIdx++;
             }
@@ -1178,7 +1178,7 @@ static VOS_STATUS btcDeferDisconnectEventForACL( tpAniSirGlobal pMac, tpSmeBtEve
     tpSmeBtAclModeChangeEventHist pModeChangeEventHist;
     v_BOOL_t fDone = VOS_FALSE;
     int i;
-    pAclEventHist = btcFindAclEventHist( pMac, NULL, 
+    pAclEventHist = btcFindAclEventHist( pMac, NULL,
                                 pEvent->uEventParam.btDisconnect.connectionHandle );
     if(pAclEventHist)
     {
@@ -1215,7 +1215,7 @@ static VOS_STATUS btcDeferDisconnectEventForACL( tpAniSirGlobal pMac, tpSmeBtEve
             //Save this disconnect event
             if(pAclEventHist->bNextEventIdx < BT_MAX_NUM_EVENT_ACL_DEFERRED)
             {
-                pAclEventHist->btEventType[pAclEventHist->bNextEventIdx] = 
+                pAclEventHist->btEventType[pAclEventHist->bNextEventIdx] =
                     BT_EVENT_DISCONNECTION_COMPLETE;
                 pAclEventHist->btAclConnection[pAclEventHist->bNextEventIdx].connectionHandle =
                     pEvent->uEventParam.btDisconnect.connectionHandle;
@@ -1233,7 +1233,7 @@ static VOS_STATUS btcDeferDisconnectEventForACL( tpAniSirGlobal pMac, tpSmeBtEve
         status = VOS_STATUS_E_EXISTS;
     }
     //Wipe out the related mode change event if it is there
-    pModeChangeEventHist = btcFindModeChangeEventHist( pMac,  
+    pModeChangeEventHist = btcFindModeChangeEventHist( pMac,
                             pEvent->uEventParam.btDisconnect.connectionHandle );
     if( pModeChangeEventHist && pModeChangeEventHist->fValid )
     {
@@ -1262,7 +1262,7 @@ static VOS_STATUS btcDeferDisconnectEventForSync( tpAniSirGlobal pMac, tpSmeBtEv
     tpSmeBtSyncUpdateHist pSyncUpdateHist;
     v_BOOL_t fDone = VOS_FALSE;
     int i;
-    pSyncEventHist = btcFindSyncEventHist( pMac, NULL, 
+    pSyncEventHist = btcFindSyncEventHist( pMac, NULL,
                                 pEvent->uEventParam.btDisconnect.connectionHandle );
     if(pSyncEventHist)
     {
@@ -1300,7 +1300,7 @@ static VOS_STATUS btcDeferDisconnectEventForSync( tpAniSirGlobal pMac, tpSmeBtEv
             //Save this disconnect event
             if(pSyncEventHist->bNextEventIdx < BT_MAX_NUM_EVENT_SCO_DEFERRED)
             {
-                pSyncEventHist->btEventType[pSyncEventHist->bNextEventIdx] = 
+                pSyncEventHist->btEventType[pSyncEventHist->bNextEventIdx] =
                     BT_EVENT_DISCONNECTION_COMPLETE;
                 pSyncEventHist->btSyncConnection[pSyncEventHist->bNextEventIdx].connectionHandle =
                     pEvent->uEventParam.btDisconnect.connectionHandle;
@@ -1318,7 +1318,7 @@ static VOS_STATUS btcDeferDisconnectEventForSync( tpAniSirGlobal pMac, tpSmeBtEv
         status = VOS_STATUS_E_EXISTS;
     }
     //Wipe out the related mode change event if it is there
-    pSyncUpdateHist = btcFindSyncUpdateEventHist( pMac,  
+    pSyncUpdateHist = btcFindSyncUpdateEventHist( pMac,
                             pEvent->uEventParam.btDisconnect.connectionHandle );
     if( pSyncUpdateHist && pSyncUpdateHist->fValid )
     {
@@ -1329,8 +1329,8 @@ static VOS_STATUS btcDeferDisconnectEventForSync( tpAniSirGlobal pMac, tpSmeBtEv
 
 /*
   Defer a disconnect event.
-  Try to defer it as part of the ACL event first. 
-  If no match is found, try SYNC. 
+  Try to defer it as part of the ACL event first.
+  If no match is found, try SYNC.
   If still no match found, defer it at DISCONNECT event bin.
 */
 static VOS_STATUS btcDeferDisconnEvent( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
@@ -1351,7 +1351,7 @@ static VOS_STATUS btcDeferDisconnEvent( tpAniSirGlobal pMac, tpSmeBtEvent pEvent
     if( !VOS_IS_STATUS_SUCCESS(status) )
     {
         //Save the disconnect event
-        pDisconnEventHist = btcFindDisconnEventHist( pMac, 
+        pDisconnEventHist = btcFindDisconnEventHist( pMac,
             pEvent->uEventParam.btDisconnect.connectionHandle );
         if( pDisconnEventHist )
         {
@@ -1426,12 +1426,12 @@ static VOS_STATUS btcDeferEvent( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
             break;
         }
         //Find a match on handle. If not found, get a free slot.
-        pSyncUpdateHist = btcFindSyncUpdateEventHist( pMac,  
+        pSyncUpdateHist = btcFindSyncUpdateEventHist( pMac,
                                     pEvent->uEventParam.btSyncConnection.connectionHandle );
         if(pSyncUpdateHist)
         {
             pSyncUpdateHist->fValid = VOS_TRUE;
-            vos_mem_copy(&pSyncUpdateHist->btSyncConnection, &pEvent->uEventParam.btSyncConnection, 
+            vos_mem_copy(&pSyncUpdateHist->btSyncConnection, &pEvent->uEventParam.btSyncConnection,
                             sizeof(tSmeBtSyncConnectionParam));
         }
         else
@@ -1452,7 +1452,7 @@ static VOS_STATUS btcDeferEvent( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
             break;
         }
         //Find a match on handle, If not found, return a free slot
-        pModeChangeEventHist = btcFindModeChangeEventHist( pMac,  
+        pModeChangeEventHist = btcFindModeChangeEventHist( pMac,
                                     pEvent->uEventParam.btAclModeChange.connectionHandle );
         if(pModeChangeEventHist)
         {
@@ -1488,7 +1488,7 @@ static VOS_STATUS btcDeferEvent( tpAniSirGlobal pMac, tpSmeBtEvent pEvent )
     1. If BT_SWITCH_OFF event, send it.
     2. Send INQUIRY event (START or STOP),if available
     3. Send PAGE event (START or STOP), if available
-    4. Send DISCONNECT events, these DISCONNECT events are not tied to 
+    4. Send DISCONNECT events, these DISCONNECT events are not tied to
         any ACL/SYNC event that we have cached
     5. Send ACL events (possible events, CREATION, COMPLETION, DISCONNECT)
     6. Send MODE_CHANGE events, if available
@@ -1503,13 +1503,13 @@ static void btcReplayEvents( tpAniSirGlobal pMac )
     tpSmeBtAclEventHist pAclHist;
     tpSmeBtSyncEventHist pSyncHist;
     tSmeBtcEventReplay *pReplay = &pMac->btc.btcEventReplay;
-    //Always turn on HB monitor first. 
+    //Always turn on HB monitor first.
     //It is independent of BT events even though BT event causes this
     if( pReplay->fRestoreHBMonitor )
     {
         pReplay->fRestoreHBMonitor = VOS_FALSE;
         //Only do it when needed
-        if( !pMac->btc.btcHBActive ) 
+        if( !pMac->btc.btcHBActive )
         {
             ccmCfgSetInt(pMac, WNI_CFG_HEART_BEAT_THRESHOLD, pMac->btc.btcHBCount, NULL, eANI_BOOLEAN_FALSE);
             pMac->btc.btcHBActive = VOS_TRUE;
@@ -1584,7 +1584,7 @@ static void btcReplayEvents( tpAniSirGlobal pMac )
             {
                 vos_mem_zero( &btEvent, sizeof(tSmeBtEvent) );
                 btEvent.btEventType = BT_EVENT_DISCONNECTION_COMPLETE;
-                vos_mem_copy( &btEvent.uEventParam.btDisconnect, 
+                vos_mem_copy( &btEvent.uEventParam.btDisconnect,
                     &pReplay->btcEventHist.btDisconnectEvent[i].btDisconnect, sizeof(tSmeBtDisconnectParam) );
                 btcSendBTEvent( pMac, &btEvent );
             }
@@ -1604,7 +1604,7 @@ static void btcReplayEvents( tpAniSirGlobal pMac )
                     if(BT_EVENT_DISCONNECTION_COMPLETE != btEvent.btEventType)
                     {
                         //It must be CREATE or CONNECTION_COMPLETE
-                       vos_mem_copy( &btEvent.uEventParam.btAclConnection, 
+                       vos_mem_copy( &btEvent.uEventParam.btAclConnection,
                                      &pAclHist->btAclConnection[j], sizeof(tSmeBtAclConnectionParam) );
                     }
                     else
@@ -1622,7 +1622,7 @@ static void btcReplayEvents( tpAniSirGlobal pMac )
             {
                 vos_mem_zero( &btEvent, sizeof(tSmeBtEvent) );
                 btEvent.btEventType = BT_EVENT_MODE_CHANGED;
-                vos_mem_copy( &btEvent.uEventParam.btAclModeChange, 
+                vos_mem_copy( &btEvent.uEventParam.btAclModeChange,
                     &pReplay->btcEventHist.btAclModeChangeEvent[i].btAclModeChange, sizeof(tSmeBtAclModeChangeParam) );
                 btcSendBTEvent( pMac, &btEvent );
             }
@@ -1655,7 +1655,7 @@ static void btcReplayEvents( tpAniSirGlobal pMac )
                     if(BT_EVENT_DISCONNECTION_COMPLETE != btEvent.btEventType)
                     {
                         //Must be CREATION or CONNECTION_COMPLETE
-                       vos_mem_copy( &btEvent.uEventParam.btSyncConnection, 
+                       vos_mem_copy( &btEvent.uEventParam.btSyncConnection,
                                      &pSyncHist->btSyncConnection[j], sizeof(tSmeBtSyncConnectionParam) );
                     }
                     else
@@ -1673,8 +1673,8 @@ static void btcReplayEvents( tpAniSirGlobal pMac )
             {
                 vos_mem_zero( &btEvent, sizeof(tSmeBtEvent) );
                 btEvent.btEventType = BT_EVENT_SYNC_CONNECTION_UPDATED;
-                vos_mem_copy( &btEvent.uEventParam.btSyncConnection, 
-                            &pReplay->btcEventHist.btSyncUpdateEvent[i].btSyncConnection, 
+                vos_mem_copy( &btEvent.uEventParam.btSyncConnection,
+                            &pReplay->btcEventHist.btSyncUpdateEvent[i].btSyncConnection,
                             sizeof(tSmeBtSyncConnectionParam) );
                 btcSendBTEvent( pMac, &btEvent );
             }
@@ -1801,7 +1801,7 @@ void btcUapsdCheck( tpAniSirGlobal pMac, tpSmeBtEvent pBtEvent )
    switch( pBtEvent->btEventType )
    {
    case BT_EVENT_DISCONNECTION_COMPLETE:
-       if( (VOS_FALSE == pMac->btc.btcUapsdOk) && 
+       if( (VOS_FALSE == pMac->btc.btcUapsdOk) &&
            BT_INVALID_CONN_HANDLE != pBtEvent->uEventParam.btDisconnect.connectionHandle )
        {
            //Check whether all SCO connections are gone
@@ -1922,7 +1922,7 @@ void btcUapsdCheck( tpAniSirGlobal pMac, tpSmeBtEvent pBtEvent )
                }
        }
            /*If No Other Sco/A2DP is ON reenable UAPSD*/
-           if( (BT_MAX_SCO_SUPPORT == i)  && !pMac->btc.fA2DPUp)           
+           if( (BT_MAX_SCO_SUPPORT == i)  && !pMac->btc.fA2DPUp)
            {
                pMac->btc.btcUapsdOk = VOS_TRUE;
            }
@@ -1984,7 +1984,7 @@ eHalStatus btcHandleCoexInd(tHalHandle hHal, void* pMsg)
      // resume heartbeat monitoring
      else if (pSmeCoexInd->coexIndType == SIR_COEX_IND_TYPE_ENABLE_HB_MONITOR)
      {
-        if (!pMac->btc.btcHBActive) 
+        if (!pMac->btc.btcHBActive)
         {
            ccmCfgSetInt(pMac, WNI_CFG_HEART_BEAT_THRESHOLD, pMac->btc.btcHBCount, NULL, eANI_BOOLEAN_FALSE);
            pMac->btc.btcHBActive = VOS_TRUE;
diff --git a/CORE/SME/src/ccm/ccmApi.c b/CORE/SME/src/ccm/ccmApi.c
index e9f5dba4238d..f79ef2ab02fa 100644
--- a/CORE/SME/src/ccm/ccmApi.c
+++ b/CORE/SME/src/ccm/ccmApi.c
@@ -84,18 +84,18 @@ static tANI_U32 * encodeCfgReq(tHddHandle hHdd, tANI_U32 *pl, tANI_U32 cfgId, tA
 
 /*
  * CCM_STRING_TYPE                       CCM_INTEGER_TYPE
- * |<--------  4   ----->|               |<--------  4   ----->|                          
- * +----------+            <-- msg  -->  +----------+                                 
- * |type      |                          |type      |           
- * +----------+                          +----------+           
- * |msgLen=24 |                          |msgLen=16 |           
+ * |<--------  4   ----->|               |<--------  4   ----->|
+ * +----------+            <-- msg  -->  +----------+
+ * |type      |                          |type      |
+ * +----------+                          +----------+
+ * |msgLen=24 |                          |msgLen=16 |
  * +----------+----------+               +----------+----------+
- * | cfgId               |               | cfgId               |  
+ * | cfgId               |               | cfgId               |
  * +---------------------+               +---------------------+
- * | length=11           |               | length=4            |  
+ * | length=11           |               | length=4            |
  * +---------------------+               +---------------------+
- * |                     |               | value               |  
- * |                     |               +---------------------+  
+ * |                     |               | value               |
+ * |                     |               +---------------------+
  * |                     |
  * |                +----+
  * |                |////| <- padding to 4-byte boundary
@@ -255,8 +255,8 @@ static void sendQueuedReqToMacSw(tpAniSirGlobal pMac, tHddHandle hHdd)
     return ;
 }
 
-static eHalStatus cfgSetSub(tpAniSirGlobal pMac, tHddHandle hHdd, tANI_U32 cfgId, tANI_U32 type, 
-                            tANI_S32 length, void *ccmPtr, tANI_U32 ccmValue, 
+static eHalStatus cfgSetSub(tpAniSirGlobal pMac, tHddHandle hHdd, tANI_U32 cfgId, tANI_U32 type,
+                            tANI_S32 length, void *ccmPtr, tANI_U32 ccmValue,
                             tCcmCfgSetCallback callback, eAniBoolean toBeSaved, void *sem, tCfgReq **r)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -409,7 +409,7 @@ eHalStatus ccmClose(tHalHandle hHal)
 {
     tHddHandle hHdd = halHandle2HddHandle(hHal);
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
-    tANI_U32 i ; 
+    tANI_U32 i ;
     tCfgReq *req ;
 
     ccmStop(hHal);
@@ -643,7 +643,7 @@ eHalStatus ccmCfgGetInt(tHalHandle hHal, tANI_U32 cfgId, tANI_U32 *pValue)
 
     if (req && req->state == eCCM_REQ_DONE)
     {
-        *pValue = req->ccmValue ; 
+        *pValue = req->ccmValue ;
     }
     else
     {
@@ -683,17 +683,17 @@ eHalStatus ccmCfgGetStr(tHalHandle hHal, tANI_U32 cfgId, tANI_U8 *pBuf, tANI_U32
 
 /*
  * Loop thru comp[] and form an ANI message which contains all completed cfgIds.
- * The message begins with an INTEGER parameter (cfgId=CFG_UPDATE_MAGIC_DWORD)     
+ * The message begins with an INTEGER parameter (cfgId=CFG_UPDATE_MAGIC_DWORD)
  * to mark the start of the message.
- */ 
+ */
 static eHalStatus cfgUpdate(tpAniSirGlobal pMac, tHddHandle hHdd, tCcmCfgSetCallback callback)
 {
     tANI_U32 i, *pl ;
     tCfgReq *req ;
     tSirMbMsg *msg ;
     eHalStatus status ;
-    tANI_S16 msgLen = 4 +       /* 4 bytes for msg header */ 
-                                /* for CFG_UPDATE_MAGIC_DWORD */ 
+    tANI_S16 msgLen = 4 +       /* 4 bytes for msg header */
+                                /* for CFG_UPDATE_MAGIC_DWORD */
         CFGOBJ_ID_SIZE +
         CFGOBJ_LEN_SIZE +
         CFGOBJ_INTEGER_VALUE_SIZE ;
@@ -827,4 +827,3 @@ eHalStatus ccmCfgUpdate(tHalHandle hHal, tCcmCfgSetCallback callback)
 
     return status ;
 }
-
diff --git a/CORE/SME/src/ccm/ccmLogDump.c b/CORE/SME/src/ccm/ccmLogDump.c
index 53e6e51412a2..7ebd35b260c5 100644
--- a/CORE/SME/src/ccm/ccmLogDump.c
+++ b/CORE/SME/src/ccm/ccmLogDump.c
@@ -46,9 +46,8 @@ static tDumpFuncEntry ccmMenuDumpTable[] = {
 
 void ccmDumpInit(tHalHandle hHal)
 {
-   logDumpRegisterTable( (tpAniSirGlobal) hHal, &ccmMenuDumpTable[0], 
+   logDumpRegisterTable( (tpAniSirGlobal) hHal, &ccmMenuDumpTable[0],
                          sizeof(ccmMenuDumpTable)/sizeof(ccmMenuDumpTable[0]) );
 }
 
 #endif //#if defined(ANI_LOGDUMP)
-
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 4802737463ca..3c11fc7da6cc 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -27,12 +27,12 @@
  */
 
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
-  
-  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
+
+
     \file csrApiRoam.c
-  
+
     Implementation for the Common Roaming interfaces.
 ========================================================================== */
 /*===========================================================================
@@ -43,7 +43,7 @@
 
   when            who                 what, where, why
 ----------       ---                --------------------------------------------------------
-06/03/10     js                     Added support to hostapd driven 
+06/03/10     js                     Added support to hostapd driven
  *                                  deauth/disassoc/mic failure
 ===========================================================================*/
 #include "aniGlobal.h" //for tpAniSirGlobal
@@ -75,11 +75,11 @@
 #define CSR_WAIT_FOR_KEY_TIMEOUT_PERIOD         ( 5 * PAL_TIMER_TO_SEC_UNIT )  // 5 seconds, for WPA, WPA2, CCKM
 #define CSR_WAIT_FOR_WPS_KEY_TIMEOUT_PERIOD         ( 120 * PAL_TIMER_TO_SEC_UNIT )  // 120 seconds, for WPS
 /*---------------------------------------------------------------------------
-  OBIWAN recommends [8 10]% : pick 9% 
+  OBIWAN recommends [8 10]% : pick 9%
 ---------------------------------------------------------------------------*/
 #define CSR_VCC_UL_MAC_LOSS_THRESHOLD 9
 /*---------------------------------------------------------------------------
-  OBIWAN recommends -85dBm 
+  OBIWAN recommends -85dBm
 ---------------------------------------------------------------------------*/
 #define CSR_VCC_RSSI_THRESHOLD 80
 #define CSR_MIN_GLOBAL_STAT_QUERY_PERIOD   500 //ms
@@ -100,12 +100,12 @@
 static tANI_BOOLEAN bRoamScanOffloadStarted = VOS_FALSE;
 #endif
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Static Type declarations
   ------------------------------------------------------------------------*/
 static tCsrRoamSession csrRoamRoamSession[CSR_ROAM_SESSION_MAX];
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Type declarations
   ------------------------------------------------------------------------*/
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
@@ -175,16 +175,16 @@ int diagEncTypeFromCSRType(eCsrEncryptionType encType)
     return (n);
 }
 #endif //#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
-static const tANI_U8 csrStartIbssChannels50[ CSR_NUM_IBSS_START_CHANNELS_50 ] = { 36, 40,  44,  48}; 
+static const tANI_U8 csrStartIbssChannels50[ CSR_NUM_IBSS_START_CHANNELS_50 ] = { 36, 40,  44,  48};
 static const tANI_U8 csrStartIbssChannels24[ CSR_NUM_IBSS_START_CHANNELS_24 ] = { 1, 6, 11 };
 static void initConfigParam(tpAniSirGlobal pMac);
 static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pCommand,
                                        eCsrRoamCompleteResult Result, void *Context );
-static eHalStatus csrRoamStartIbss( tpAniSirGlobal pMac, tANI_U32 sessionId, 
-                                    tCsrRoamProfile *pProfile, 
+static eHalStatus csrRoamStartIbss( tpAniSirGlobal pMac, tANI_U32 sessionId,
+                                    tCsrRoamProfile *pProfile,
                                     tANI_BOOLEAN *pfSameIbss );
 static void csrRoamUpdateConnectedProfileFromNewBss( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirSmeNewBssInfo *pNewBss );
-static void csrRoamPrepareBssParams(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+static void csrRoamPrepareBssParams(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                                      tSirBssDescription *pBssDesc, tBssConfigParam *pBssConfig, tDot11fBeaconIEs *pIes);
 static ePhyChanBondState csrGetCBModeFromIes(tpAniSirGlobal pMac, tANI_U8 primaryChn, tDot11fBeaconIEs *pIes);
 eHalStatus csrInitGetChannels(tpAniSirGlobal pMac);
@@ -194,7 +194,7 @@ eHalStatus csrRoamClose(tpAniSirGlobal pMac);
 void csrRoamMICErrorTimerHandler(void *pv);
 void csrRoamTKIPCounterMeasureTimerHandler(void *pv);
 tANI_BOOLEAN csrRoamIsSameProfileKeys(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pConnProfile, tCsrRoamProfile *pProfile2);
- 
+
 static eHalStatus csrRoamStartRoamingTimer(tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U32 interval);
 static eHalStatus csrRoamStopRoamingTimer(tpAniSirGlobal pMac, tANI_U32 sessionId);
 static void csrRoamRoamingTimerHandler(void *pv);
@@ -204,19 +204,19 @@ static void csrRoamWaitForKeyTimeOutHandler(void *pv);
 static eHalStatus CsrInit11dInfo(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo);
 static eHalStatus csrInitChannelPowerList( tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo);
 static eHalStatus csrRoamFreeConnectedInfo( tpAniSirGlobal pMac, tCsrRoamConnectedInfo *pConnectedInfo );
-eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, 
-           tSirMacAddr peerMacAddr, tANI_U8 numKeys, tAniEdType edType, 
+eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId,
+           tSirMacAddr peerMacAddr, tANI_U8 numKeys, tAniEdType edType,
            tANI_BOOLEAN fUnicast, tAniKeyDirection aniKeyDirection,
-           tANI_U8 keyId, tANI_U8 keyLength, tANI_U8 *pKey, tANI_U8 paeRole, 
+           tANI_U8 keyId, tANI_U8 keyLength, tANI_U8 *pKey, tANI_U8 paeRole,
            tANI_U8 *pKeyRsc );
-static eHalStatus csrRoamIssueReassociate( tpAniSirGlobal pMac, tANI_U32 sessionId, 
-                                    tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, 
+static eHalStatus csrRoamIssueReassociate( tpAniSirGlobal pMac, tANI_U32 sessionId,
+                                    tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes,
                                     tCsrRoamProfile *pProfile );
 void csrRoamStatisticsTimerHandler(void *pv);
 void csrRoamStatsGlobalClassDTimerHandler(void *pv);
 static void csrRoamLinkUp(tpAniSirGlobal pMac, tCsrBssid bssid);
-VOS_STATUS csrRoamVccTriggerRssiIndCallback(tHalHandle hHal, 
-                                            v_U8_t  rssiNotification, 
+VOS_STATUS csrRoamVccTriggerRssiIndCallback(tHalHandle hHal,
+                                            v_U8_t  rssiNotification,
                                             void * context);
 static void csrRoamLinkDown(tpAniSirGlobal pMac, tANI_U32 sessionId);
 void csrRoamVccTrigger(tpAniSirGlobal pMac);
@@ -232,12 +232,12 @@ tCsrStatsClientReqInfo * csrRoamInsertEntryIntoList( tpAniSirGlobal pMac,
                                                      tDblLinkList *pStaList,
                                                      tCsrStatsClientReqInfo *pStaEntry);
 void csrRoamStatsClientTimerHandler(void *pv);
-tCsrPeStatsReqInfo *  csrRoamCheckPeStatsReqList(tpAniSirGlobal pMac, tANI_U32  statsMask, 
+tCsrPeStatsReqInfo *  csrRoamCheckPeStatsReqList(tpAniSirGlobal pMac, tANI_U32  statsMask,
                                                  tANI_U32 periodicity,
                                                  tANI_BOOLEAN *pFound,
                                                  tANI_U8 staId,
                                                  tANI_U8 sessionId);
-void csrRoamReportStatistics(tpAniSirGlobal pMac, tANI_U32 statsMask, 
+void csrRoamReportStatistics(tpAniSirGlobal pMac, tANI_U32 statsMask,
                              tCsrStatsCallback callback, tANI_U8 staId, void *pContext);
 void csrRoamSaveStatsFromTl(tpAniSirGlobal pMac, WLANTL_TRANSFER_STA_TYPE *pTlStats);
 void csrRoamTlStatsTimerHandler(void *pv);
@@ -249,7 +249,7 @@ eHalStatus csrRoamDeregStatisticsReq(tpAniSirGlobal pMac);
 static tANI_U32 csrFindIbssSession( tpAniSirGlobal pMac );
 static eHalStatus csrRoamStartWds( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc );
 static void csrInitSession( tpAniSirGlobal pMac, tANI_U32 sessionId );
-static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessionId, 
+static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessionId,
                                              tCsrRoamSetKey *pSetKey, tANI_U32 roamId );
 //static eHalStatus csrRoamProcessStopBss( tpAniSirGlobal pMac, tSmeCmd *pCommand );
 static eHalStatus csrRoamGetQosInfoFromBss(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc);
@@ -285,7 +285,7 @@ eHalStatus csrOpen(tpAniSirGlobal pMac)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tANI_U32 i;
-    
+
     do
     {
         /* Initialize CSR Roam Globals */
@@ -306,7 +306,7 @@ eHalStatus csrOpen(tpAniSirGlobal pMac)
         if(!HAL_STATUS_SUCCESS(csrLLOpen(pMac->hHdd, &pMac->roam.roamCmdPendingList)))
            break;
     }while(0);
-    
+
     return (status);
 }
 
@@ -340,10 +340,16 @@ eHalStatus csr_init_chan_list(tpAniSirGlobal mac)
                                               mac->scan.countryCodeDefault,
                                               &reg_id, source);
     if (status != eHAL_STATUS_SUCCESS)
+    {
+       smsLog(mac, LOGE, FL("csrGetRegulatoryDomainForCountry failed"));
        return status;
+    }
 
     if (vos_nv_setRegDomain(mac, reg_id, FALSE) != VOS_STATUS_SUCCESS)
+    {
+       smsLog(mac, LOGE, FL("vos_nv_setRegDomain failed"));
        return eHAL_STATUS_FAILURE;
+    }
     mac->scan.domainIdDefault = reg_id;
     mac->scan.domainIdCurrent = mac->scan.domainIdDefault;
     vos_mem_copy(mac->scan.countryCodeCurrent,
@@ -366,7 +372,7 @@ eHalStatus csrSetRegInfo(tHalHandle hHal,  tANI_U8 *apCntryCode)
        return eHAL_STATUS_FAILURE;
     }
     smsLog( pMac, LOGW, FL(" country Code %.2s"), apCntryCode );
-    /* To get correct Regulatory domain from NV table 
+    /* To get correct Regulatory domain from NV table
      * 2 character Country code should be used
      * 3rd charater is optional for indoor/outdoor setting */
     cntryCodeLength = WNI_CFG_COUNTRY_CODE_LEN;
@@ -425,7 +431,7 @@ eHalStatus csrSetChannels(tHalHandle hHal,  tCsrConfigParam *pParam  )
         pParam->Csr11dinfo.ChnPower[index].maxtxPower = pMac->scan.defaultPowerTable[index].pwr;
     }
     pParam->Csr11dinfo.Channels.numChannels = pMac->scan.base20MHzChannels.numChannels;
-    
+
     return status;
 }
 eHalStatus csrClose(tpAniSirGlobal pMac)
@@ -440,7 +446,7 @@ eHalStatus csrClose(tpAniSirGlobal pMac)
     /* DeInit Globals */
     csrRoamDeInitGlobals(pMac);
     return (status);
-} 
+}
 
 static tChannelPwrLimit csrFindChannelPwr(tChannelListWithPower * pdefaultPowerTable,
                                  tANI_U8 ChannelNum)
@@ -510,7 +516,7 @@ eHalStatus csrStart(tpAniSirGlobal pMac)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tANI_U32 i;
- 
+
     do
     {
        //save the global vos context
@@ -551,7 +557,7 @@ eHalStatus csrStart(tpAniSirGlobal pMac)
         pMac->roam.tlStatsReqInfo.timerRunning = FALSE;
         //init the link quality indication also
         pMac->roam.vccLinkQuality = eCSR_ROAM_LINK_QUAL_MIN_IND;
-        if(!HAL_STATUS_SUCCESS(status)) 
+        if(!HAL_STATUS_SUCCESS(status))
         {
            smsLog(pMac, LOGW, " csrStart: Couldn't Init HO control blk ");
            break;
@@ -584,7 +590,7 @@ eHalStatus csrStop(tpAniSirGlobal pMac, tHalStopType stopType)
     pMac->scan.fCancelIdleScan = eANI_BOOLEAN_FALSE;
     pMac->scan.fRestartIdleScan = eANI_BOOLEAN_FALSE;
     csrLLPurge( &pMac->roam.roamCmdPendingList, eANI_BOOLEAN_TRUE );
-    
+
 #if   defined WLAN_FEATURE_NEIGHBOR_ROAMING
     csrNeighborRoamClose(pMac);
 #endif
@@ -638,8 +644,8 @@ eHalStatus csrReady(tpAniSirGlobal pMac)
     csrInitBGScanChannelList(pMac);
     /* HDD issues the init scan */
     csrScanStartResultAgingTimer(pMac);
-    /* If the gScanAgingTime is set to '0' then scan results aging timeout 
-         based  on timer feature is not enabled*/  
+    /* If the gScanAgingTime is set to '0' then scan results aging timeout
+         based  on timer feature is not enabled*/
     if(0 != pMac->scan.scanResultCfgAgingTime )
     {
        csrScanStartResultCfgAgingTimer(pMac);
@@ -666,7 +672,7 @@ void csrSetGlobalCfgs( tpAniSirGlobal pMac )
     ccmCfgSetInt(pMac, WNI_CFG_FRAGMENTATION_THRESHOLD, csrGetFragThresh(pMac), NULL, eANI_BOOLEAN_FALSE);
     ccmCfgSetInt(pMac, WNI_CFG_RTS_THRESHOLD, csrGetRTSThresh(pMac), NULL, eANI_BOOLEAN_FALSE);
     ccmCfgSetInt(pMac, WNI_CFG_11D_ENABLED,
-                        ((pMac->roam.configParam.Is11hSupportEnabled) ? pMac->roam.configParam.Is11dSupportEnabled : pMac->roam.configParam.Is11dSupportEnabled), 
+                        ((pMac->roam.configParam.Is11hSupportEnabled) ? pMac->roam.configParam.Is11dSupportEnabled : pMac->roam.configParam.Is11dSupportEnabled),
                         NULL, eANI_BOOLEAN_FALSE);
     ccmCfgSetInt(pMac, WNI_CFG_11H_ENABLED, pMac->roam.configParam.Is11hSupportEnabled, NULL, eANI_BOOLEAN_FALSE);
     /* For now we will just use the 5GHz CB mode ini parameter to decide whether CB supported or not in Probes when there is no session
@@ -674,10 +680,10 @@ void csrSetGlobalCfgs( tpAniSirGlobal pMac )
      */
     ccmCfgSetInt(pMac, WNI_CFG_CHANNEL_BONDING_MODE, !!(pMac->roam.configParam.channelBondingMode5GHz), NULL, eANI_BOOLEAN_FALSE);
     ccmCfgSetInt(pMac, WNI_CFG_HEART_BEAT_THRESHOLD, pMac->roam.configParam.HeartbeatThresh24, NULL, eANI_BOOLEAN_FALSE);
-    
+
     //Update the operating mode to configured value during initialization,
     //So that client can advertise full capabilities in Probe request frame.
-    csrSetDefaultDot11Mode( pMac );    
+    csrSetDefaultDot11Mode( pMac );
 }
 
 eHalStatus csrRoamOpen(tpAniSirGlobal pMac)
@@ -747,7 +753,7 @@ eHalStatus csrRoamGetConnectState(tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrC
     {
         status = eHAL_STATUS_SUCCESS;
         *pState = pMac->roam.roamSession[sessionId].connectState;
-    }    
+    }
     return (status);
 }
 
@@ -762,7 +768,7 @@ eHalStatus csrRoamCopyConnectProfile(tpAniSirGlobal pMac, tANI_U32 sessionId, tC
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     if(pProfile)
     {
         if(pSession->pConnectBssDesc)
@@ -817,14 +823,14 @@ eHalStatus csrRoamCopyConnectProfile(tpAniSirGlobal pMac, tANI_U32 sessionId, tC
                                   CSR_KRK_KEY_LEN);
                     pProfile->ccxCckmInfo.reassoc_req_num=
                         pSession->connectedProfile.ccxCckmInfo.reassoc_req_num;
-                    pProfile->ccxCckmInfo.krk_plumbed = 
+                    pProfile->ccxCckmInfo.krk_plumbed =
                         pSession->connectedProfile.ccxCckmInfo.krk_plumbed;
                 }
 #endif
             }while(0);
         }
     }
-    
+
     return (status);
 }
 
@@ -846,7 +852,7 @@ eHalStatus csrRoamGetConnectProfile(tpAniSirGlobal pMac, tANI_U32 sessionId, tCs
 eHalStatus csrRoamFreeConnectProfile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pProfile)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
-    
+
     if (pProfile->pBssDesc)
     {
         vos_mem_free(pProfile->pBssDesc);
@@ -875,22 +881,22 @@ static eHalStatus csrRoamFreeConnectedInfo( tpAniSirGlobal pMac, tCsrRoamConnect
     pConnectedInfo->staId = 0;
 #ifdef WLAN_FEATURE_VOWIFI_11R
     pConnectedInfo->nRICRspLength = 0;
-#endif    
+#endif
 #ifdef FEATURE_WLAN_CCX
     pConnectedInfo->nTspecIeLength = 0;
-#endif    
+#endif
     return ( status );
 }
 
-    
-                
-                
+
+
+
 void csrReleaseCommandPreauth(tpAniSirGlobal pMac, tSmeCmd *pCommand)
 {
     csrReinitPreauthCmd(pMac, pCommand);
     csrReleaseCommand( pMac, pCommand );
 }
-                
+
 void csrReleaseCommandRoam(tpAniSirGlobal pMac, tSmeCmd *pCommand)
 {
     csrReinitRoamCmd(pMac, pCommand);
@@ -986,16 +992,16 @@ void csrRoamSubstateChange( tpAniSirGlobal pMac, eCsrRoamSubState NewSubstate, t
 eCsrRoamState csrRoamStateChange( tpAniSirGlobal pMac, eCsrRoamState NewRoamState, tANI_U8 sessionId)
 {
     eCsrRoamState PreviousState;
-          
+
     smsLog( pMac, LOG1, "CSR RoamState[%hu]: [ %d <== %d ]", sessionId,
             NewRoamState, pMac->roam.curState[sessionId]);
 
     PreviousState = pMac->roam.curState[sessionId];
-    
-    if ( NewRoamState != pMac->roam.curState[sessionId] ) 
+
+    if ( NewRoamState != pMac->roam.curState[sessionId] )
     {
         // Whenever we transition OUT of the Roaming state, clear the Roaming substate...
-        if ( CSR_IS_ROAM_JOINING(pMac, sessionId) ) 
+        if ( CSR_IS_ROAM_JOINING(pMac, sessionId) )
         {
             csrRoamSubstateChange( pMac, eCSR_ROAM_SUBSTATE_NONE, sessionId );
         }
@@ -1041,10 +1047,10 @@ static void initConfigParam(tpAniSirGlobal pMac)
     pMac->roam.configParam.ProprietaryRatesEnabled = eANI_BOOLEAN_TRUE;
     pMac->roam.configParam.TxRate = eCSR_TX_RATE_AUTO;
     pMac->roam.configParam.impsSleepTime = CSR_IDLE_SCAN_NO_PS_INTERVAL;
-    pMac->roam.configParam.scanAgeTimeNCNPS = CSR_SCAN_AGING_TIME_NOT_CONNECT_NO_PS;  
-    pMac->roam.configParam.scanAgeTimeNCPS = CSR_SCAN_AGING_TIME_NOT_CONNECT_W_PS;   
-    pMac->roam.configParam.scanAgeTimeCNPS = CSR_SCAN_AGING_TIME_CONNECT_NO_PS;   
-    pMac->roam.configParam.scanAgeTimeCPS = CSR_SCAN_AGING_TIME_CONNECT_W_PS;   
+    pMac->roam.configParam.scanAgeTimeNCNPS = CSR_SCAN_AGING_TIME_NOT_CONNECT_NO_PS;
+    pMac->roam.configParam.scanAgeTimeNCPS = CSR_SCAN_AGING_TIME_NOT_CONNECT_W_PS;
+    pMac->roam.configParam.scanAgeTimeCNPS = CSR_SCAN_AGING_TIME_CONNECT_NO_PS;
+    pMac->roam.configParam.scanAgeTimeCPS = CSR_SCAN_AGING_TIME_CONNECT_W_PS;
     for(i = 0; i < CSR_NUM_RSSI_CAT; i++)
     {
         pMac->roam.configParam.BssPreferValue[i] = i;
@@ -1101,7 +1107,7 @@ static void initConfigParam(tpAniSirGlobal pMac)
     pMac->roam.configParam.addTSWhenACMIsOff = 0;
     pMac->roam.configParam.fScanTwice = eANI_BOOLEAN_FALSE;
 
-    //Remove this code once SLM_Sessionization is supported 
+    //Remove this code once SLM_Sessionization is supported
     //BMPS_WORKAROUND_NOT_NEEDED
     pMac->roam.configParam.doBMPSWorkaround = 0;
 
@@ -1440,10 +1446,10 @@ eHalStatus csrSetBand(tHalHandle hHal, eCsrBand eBand)
 /* The funcns csrConvertCBIniValueToPhyCBState and csrConvertPhyCBStateToIniValue have been
  * introduced to convert the ini value to the ENUM used in csr and MAC for CB state
  * Ideally we should have kept the ini value and enum value same and representing the same
- * cb values as in 11n standard i.e. 
- * Set to 1 (SCA) if the secondary channel is above the primary channel 
- * Set to 3 (SCB) if the secondary channel is below the primary channel 
- * Set to 0 (SCN) if no secondary channel is present 
+ * cb values as in 11n standard i.e.
+ * Set to 1 (SCA) if the secondary channel is above the primary channel
+ * Set to 3 (SCB) if the secondary channel is below the primary channel
+ * Set to 0 (SCN) if no secondary channel is present
  * However, since our driver is already distributed we will keep the ini definition as it is which is:
  * 0 - secondary none
  * 1 - secondary LOW
@@ -1473,27 +1479,27 @@ ePhyChanBondState csrConvertCBIniValueToPhyCBState(v_U32_t cbIniValue)
         break;
 #ifdef WLAN_FEATURE_11AC
       case 3:
-        phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED; 
+        phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED;
         break;
       case 4:
         phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_CENTERED_40MHZ_CENTERED;
         break;
       case 5:
         phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_CENTERED_40MHZ_CENTERED;
-        break; 
+        break;
       case 6:
         phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW;
         break;
       case 7:
         phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW;
-        break; 
+        break;
       case 8:
         phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH;
         break;
       case 9:
         phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH;
-        break; 
-#endif 
+        break;
+#endif
       default:
         // If an invalid value is passed, disable CHANNEL BONDING
         phyCbState = PHY_SINGLE_CHANNEL_CENTERED;
@@ -1565,7 +1571,7 @@ eHalStatus csrChangeDefaultConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pPa
 
         pMac->roam.configParam.fenableMCCMode = pParam->fEnableMCCMode;
         pMac->roam.configParam.fAllowMCCGODiffBI = pParam->fAllowMCCGODiffBI;
-        
+
         /* channelBondingMode5GHz plays a dual role right now
          * INFRA STA will use this non zero value as CB enabled and SOFTAP will use this non-zero value to determine the secondary channel offset
          * This is how channelBondingMode5GHz works now and this is kept intact to avoid any cfg.ini change
@@ -1668,7 +1674,7 @@ eHalStatus csrChangeDefaultConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pPa
             pMac->roam.configParam.impsSleepTime = 0;
         }
         pMac->roam.configParam.eBand = pParam->eBand;
-        pMac->roam.configParam.uCfgDot11Mode = csrGetCfgDot11ModeFromCsrPhyMode(NULL, pMac->roam.configParam.phyMode, 
+        pMac->roam.configParam.uCfgDot11Mode = csrGetCfgDot11ModeFromCsrPhyMode(NULL, pMac->roam.configParam.phyMode,
                                                     pMac->roam.configParam.ProprietaryRatesEnabled);
         //if HDD passed down non zero values for age params, then only update,
         //otherwise keep using the defaults
@@ -1678,21 +1684,21 @@ eHalStatus csrChangeDefaultConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pPa
         }
         if(pParam->scanAgeTimeNCNPS)
         {
-            pMac->roam.configParam.scanAgeTimeNCNPS = pParam->scanAgeTimeNCNPS;  
+            pMac->roam.configParam.scanAgeTimeNCNPS = pParam->scanAgeTimeNCNPS;
         }
         if(pParam->scanAgeTimeNCPS)
         {
-            pMac->roam.configParam.scanAgeTimeNCPS = pParam->scanAgeTimeNCPS;   
+            pMac->roam.configParam.scanAgeTimeNCPS = pParam->scanAgeTimeNCPS;
         }
         if(pParam->scanAgeTimeCNPS)
         {
-            pMac->roam.configParam.scanAgeTimeCNPS = pParam->scanAgeTimeCNPS;   
+            pMac->roam.configParam.scanAgeTimeCNPS = pParam->scanAgeTimeCNPS;
         }
         if(pParam->scanAgeTimeCPS)
         {
-            pMac->roam.configParam.scanAgeTimeCPS = pParam->scanAgeTimeCPS;   
+            pMac->roam.configParam.scanAgeTimeCPS = pParam->scanAgeTimeCPS;
         }
-        
+
         csrAssignRssiForCategory(pMac, CSR_BEST_RSSI_VALUE, pParam->bCatRssiOffset);
         pMac->roam.configParam.nRoamingTime = pParam->nRoamingTime;
         pMac->roam.configParam.fEnforce11dChannels = pParam->fEnforce11dChannels;
@@ -1788,7 +1794,7 @@ eHalStatus csrChangeDefaultConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pPa
          * will automatically connect back and resume BMPS since resume BMPS is not working when moving from concurrent to
          * single session
          */
-        //Remove this code once SLM_Sessionization is supported 
+        //Remove this code once SLM_Sessionization is supported
         //BMPS_WORKAROUND_NOT_NEEDED
         pMac->roam.configParam.doBMPSWorkaround = 0;
 
@@ -1812,7 +1818,7 @@ eHalStatus csrChangeDefaultConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pPa
         pMac->roam.configParam.isCoalesingInIBSSAllowed =
                                pParam->isCoalesingInIBSSAllowed;
     }
-    
+
     return status;
 }
 
@@ -1861,16 +1867,16 @@ eHalStatus csrGetConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
         pParam->impsSleepTime = pMac->roam.configParam.impsSleepTime / PAL_TIMER_TO_SEC_UNIT;
         pParam->eBand = pMac->roam.configParam.eBand;
         pParam->nScanResultAgeCount = pMac->roam.configParam.agingCount;
-        pParam->scanAgeTimeNCNPS = pMac->roam.configParam.scanAgeTimeNCNPS;  
-        pParam->scanAgeTimeNCPS = pMac->roam.configParam.scanAgeTimeNCPS;   
-        pParam->scanAgeTimeCNPS = pMac->roam.configParam.scanAgeTimeCNPS;   
-        pParam->scanAgeTimeCPS = pMac->roam.configParam.scanAgeTimeCPS;   
+        pParam->scanAgeTimeNCNPS = pMac->roam.configParam.scanAgeTimeNCNPS;
+        pParam->scanAgeTimeNCPS = pMac->roam.configParam.scanAgeTimeNCPS;
+        pParam->scanAgeTimeCNPS = pMac->roam.configParam.scanAgeTimeCNPS;
+        pParam->scanAgeTimeCPS = pMac->roam.configParam.scanAgeTimeCPS;
         pParam->bCatRssiOffset = pMac->roam.configParam.bCatRssiOffset;
         pParam->nRoamingTime = pMac->roam.configParam.nRoamingTime;
         pParam->fEnforce11dChannels = pMac->roam.configParam.fEnforce11dChannels;
         pParam->fSupplicantCountryCodeHasPriority = pMac->roam.configParam.fSupplicantCountryCodeHasPriority;
         pParam->fEnforceCountryCodeMatch = pMac->roam.configParam.fEnforceCountryCodeMatch;
-        pParam->fEnforceDefaultDomain = pMac->roam.configParam.fEnforceDefaultDomain;        
+        pParam->fEnforceDefaultDomain = pMac->roam.configParam.fEnforceDefaultDomain;
         pParam->vccRssiThreshold = pMac->roam.configParam.vccRssiThreshold;
         pParam->vccUlMacLossThreshold = pMac->roam.configParam.vccUlMacLossThreshold;
         pParam->IsIdleScanEnabled = pMac->roam.configParam.IsIdleScanEnabled;
@@ -1971,8 +1977,8 @@ eHalStatus csrSetPhyMode(tHalHandle hHal, tANI_U32 phyMode, eCsrBand eBand, tANI
         {
             if(CSR_IS_RADIO_BG_ONLY(pMac)) break;
             if((eCSR_DOT11_MODE_11b & phyMode) || (eCSR_DOT11_MODE_11b_ONLY & phyMode) ||
-                (eCSR_DOT11_MODE_11g & phyMode) || (eCSR_DOT11_MODE_11g_ONLY & phyMode) 
-                ) 
+                (eCSR_DOT11_MODE_11g & phyMode) || (eCSR_DOT11_MODE_11g_ONLY & phyMode)
+                )
             {
                 break;
             }
@@ -2084,7 +2090,7 @@ eHalStatus csrSetPhyMode(tHalHandle hHal, tANI_U32 phyMode, eCsrBand eBand, tANI
     }
     return (status);
 }
-    
+
 void csrPruneChannelListForMode( tpAniSirGlobal pMac, tCsrChannel *pChannelList )
 {
     tANI_U8 Index;
@@ -2106,20 +2112,20 @@ void csrPruneChannelListForMode( tpAniSirGlobal pMac, tCsrChannel *pChannelList
                 }
             }
             // Cleanup the rest of channels.   Note we only need to clean up the channels if we had
-            // to trim the list.  Calling palZeroMemory() with a 0 size is going to throw asserts on 
+            // to trim the list.  Calling palZeroMemory() with a 0 size is going to throw asserts on
             // the debug builds so let's be a bit smarter about that.  Zero out the reset of the channels
             // only if we need to.
             //
-            // The amount of memory to clear is the number of channesl that we trimmed 
+            // The amount of memory to clear is the number of channesl that we trimmed
             // (pChannelList->numChannels - cChannels) times the size of a channel in the structure.
-           
+
             if ( pChannelList->numChannels > cChannels )
             {
                 vos_mem_set(&pChannelList->channelList[ cChannels ],
                              sizeof( pChannelList->channelList[ 0 ] ) *
                                  ( pChannelList->numChannels - cChannels ), 0);
             }
-            
+
             pChannelList->numChannels = cChannels;
         }
         else if ( CSR_IS_5G_BAND_ONLY( pMac ) )
@@ -2133,19 +2139,19 @@ void csrPruneChannelListForMode( tpAniSirGlobal pMac, tCsrChannel *pChannelList
                 }
             }
             // Cleanup the rest of channels.   Note we only need to clean up the channels if we had
-            // to trim the list.  Calling palZeroMemory() with a 0 size is going to throw asserts on 
+            // to trim the list.  Calling palZeroMemory() with a 0 size is going to throw asserts on
             // the debug builds so let's be a bit smarter about that.  Zero out the reset of the channels
             // only if we need to.
             //
-            // The amount of memory to clear is the number of channesl that we trimmed 
+            // The amount of memory to clear is the number of channesl that we trimmed
             // (pChannelList->numChannels - cChannels) times the size of a channel in the structure.
             if ( pChannelList->numChannels > cChannels )
             {
                 vos_mem_set(&pChannelList->channelList[ cChannels ],
                             sizeof( pChannelList->channelList[ 0 ] ) *
                             ( pChannelList->numChannels - cChannels ), 0);
-            }            
-                               
+            }
+
             pChannelList->numChannels = cChannels;
         }
     }
@@ -2173,12 +2179,12 @@ eHalStatus csrInitGetChannels(tpAniSirGlobal pMac)
     VOS_STATUS vosStatus;
     tANI_U8 Index = 0;
     tANI_U8 num40MHzChannelsFound = 0;
-    
-    
+
+
     //TODO: this interface changed to include the 40MHz channel list
     // this needs to be tied into the adapter structure somehow and referenced appropriately for CB operation
     // Read the scan channel list (including the power limit) from EEPROM
-    vosStatus = vos_nv_getChannelListWithPower( pMac->scan.defaultPowerTable, &num20MHzChannelsFound, 
+    vosStatus = vos_nv_getChannelListWithPower( pMac->scan.defaultPowerTable, &num20MHzChannelsFound,
                         pMac->scan.defaultPowerTable40MHz, &num40MHzChannelsFound);
     if ( (VOS_STATUS_SUCCESS != vosStatus) || (num20MHzChannelsFound == 0) )
     {
@@ -2209,7 +2215,7 @@ eHalStatus csrInitGetChannels(tpAniSirGlobal pMac)
         }
         pMac->scan.base40MHzChannels.numChannels = num40MHzChannelsFound;
     }
-    return (status);  
+    return (status);
 }
 
 eHalStatus csrInitChannelList( tHalHandle hHal )
@@ -2222,10 +2228,10 @@ eHalStatus csrInitChannelList( tHalHandle hHal )
     csrSaveChannelPowerForBand(pMac, eANI_BOOLEAN_TRUE);
     // Apply the base channel list, power info, and set the Country code...
     csrApplyChannelPowerCountryInfo( pMac, &pMac->scan.base20MHzChannels, pMac->scan.countryCodeCurrent, eANI_BOOLEAN_TRUE );
- 
+
     return (status);
 }
-eHalStatus csrChangeConfigParams(tpAniSirGlobal pMac, 
+eHalStatus csrChangeConfigParams(tpAniSirGlobal pMac,
                                  tCsrUpdateConfigParam *pUpdateConfigParam)
 {
    eHalStatus status = eHAL_STATUS_FAILURE;
@@ -2248,7 +2254,7 @@ static eHalStatus CsrInit11dInfo(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo)
   {
      return (status);
   }
-  if ( ps11dinfo->Channels.numChannels && ( WNI_CFG_VALID_CHANNEL_LIST_LEN >= ps11dinfo->Channels.numChannels ) ) 
+  if ( ps11dinfo->Channels.numChannels && ( WNI_CFG_VALID_CHANNEL_LIST_LEN >= ps11dinfo->Channels.numChannels ) )
   {
      pMac->scan.base20MHzChannels.numChannels = ps11dinfo->Channels.numChannels;
      vos_mem_copy(pMac->scan.base20MHzChannels.channelList,
@@ -2266,7 +2272,7 @@ static eHalStatus CsrInit11dInfo(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo)
                WNI_CFG_COUNTRY_CODE_LEN);
 
 
-  //Tush: at csropen get this initialized with default, during csr reset if this 
+  //Tush: at csropen get this initialized with default, during csr reset if this
   // already set with some value no need initilaize with default again
   if(0 == pMac->scan.countryCodeCurrent[0])
   {
@@ -2380,17 +2386,17 @@ void csrRoamRemoveDuplicateCommand(tpAniSirGlobal pMac, tANI_U32 sessionId, tSme
         // - the new roam command is a NewProfileList.
         // - the new roam command is a Forced Dissoc
         // - the new roam command is from an 802.11 OID (OID_SSID or OID_BSSID).
-        if ( 
+        if (
             (pCommand && ( pCommand->sessionId == pDupCommand->sessionId ) &&
                 ((pCommand->command == pDupCommand->command) &&
                 /* This peermac check is requried for Softap/GO scenarios
-                 * For STA scenario below OR check will suffice as pCommand will 
+                 * For STA scenario below OR check will suffice as pCommand will
                  * always be NULL for STA scenarios
                  */
                 (vos_mem_compare(pDupCommand->u.roamCmd.peerMac, pCommand->u.roamCmd.peerMac, sizeof(v_MACADDR_t))) &&
                  (pCommand->u.roamCmd.roamReason == pDupCommand->u.roamCmd.roamReason ||
                     eCsrForcedDisassoc == pCommand->u.roamCmd.roamReason ||
-                    eCsrHddIssued == pCommand->u.roamCmd.roamReason))) 
+                    eCsrHddIssued == pCommand->u.roamCmd.roamReason)))
                 ||
             //below the pCommand is NULL
             ( (sessionId == pDupCommand->sessionId) &&
@@ -2421,7 +2427,7 @@ void csrRoamRemoveDuplicateCommand(tpAniSirGlobal pMac, tANI_U32 sessionId, tSme
     }
     csrLLClose(&localList);
 }
-eHalStatus csrRoamCallCallback(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamInfo *pRoamInfo, 
+eHalStatus csrRoamCallCallback(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamInfo *pRoamInfo,
                                tANI_U32 roamId, eRoamCmdStatus u1, eCsrRoamResult u2)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -2456,12 +2462,12 @@ eHalStatus csrRoamCallCallback(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoam
     if ((u1 == eCSR_ROAM_FT_REASSOC_FAILED) && (pSession->bRefAssocStartCnt)) {
         /*
          * Decrement bRefAssocStartCnt for FT reassoc failure.
-         * Reason: For FT reassoc failures, we first call 
-         * csrRoamCallCallback before notifying a failed roam 
-         * completion through csrRoamComplete. The latter in 
-         * turn calls csrRoamProcessResults which tries to 
+         * Reason: For FT reassoc failures, we first call
+         * csrRoamCallCallback before notifying a failed roam
+         * completion through csrRoamComplete. The latter in
+         * turn calls csrRoamProcessResults which tries to
          * once again call csrRoamCallCallback if bRefAssocStartCnt
-         * is non-zero. Since this is redundant for FT reassoc 
+         * is non-zero. Since this is redundant for FT reassoc
          * failure, decrement bRefAssocStartCnt.
          */
         pSession->bRefAssocStartCnt--;
@@ -2484,9 +2490,9 @@ eHalStatus csrRoamCallCallback(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoam
         status = pSession->callback(pSession->pContext, pRoamInfo, roamId, u1, u2);
         // TODO: revisit: sme_AcquireGlobalLock( &pMac->sme );
     }
-    //EVENT_WLAN_STATUS: eCSR_ROAM_ASSOCIATION_COMPLETION, 
-    //                   eCSR_ROAM_LOSTLINK, eCSR_ROAM_DISASSOCIATED, 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR    
+    //EVENT_WLAN_STATUS: eCSR_ROAM_ASSOCIATION_COMPLETION,
+    //                   eCSR_ROAM_LOSTLINK, eCSR_ROAM_DISASSOCIATED,
+#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
     vos_mem_set(&connectionStatus,
                 sizeof(vos_event_wlan_status_payload_type), 0);
 
@@ -2561,21 +2567,21 @@ eHalStatus csrRoamCallCallback(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoam
        WLAN_VOS_DIAG_EVENT_REPORT(&connectionStatus, EVENT_WLAN_STATUS);
     }
 #endif //FEATURE_WLAN_DIAG_SUPPORT_CSR
-    
+
     return (status);
 }
 // Returns whether handoff is currently in progress or not
 tANI_BOOLEAN csrRoamIsHandoffInProgress(tpAniSirGlobal pMac)
 {
 #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
-    return csrNeighborRoamIsHandoffInProgress(pMac);                    
+    return csrNeighborRoamIsHandoffInProgress(pMac);
 #else
     return eANI_BOOLEAN_FALSE;
 #endif
 }
 eHalStatus csrRoamIssueDisassociate( tpAniSirGlobal pMac, tANI_U32 sessionId,
                                      eCsrRoamSubState NewSubstate, tANI_BOOLEAN fMICFailure )
-{   
+{
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tCsrBssid bssId = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
     tANI_U16 reasonCode;
@@ -2586,15 +2592,15 @@ eHalStatus csrRoamIssueDisassociate( tpAniSirGlobal pMac, tANI_U32 sessionId,
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
-    //Restore AC weight in case we change it 
+
+    //Restore AC weight in case we change it
     if ( csrIsConnStateConnectedInfra( pMac, sessionId ) )
     {
         smsLog(pMac, LOG1, FL(" restore AC weights (%d-%d-%d-%d)"), pMac->roam.ucACWeights[0], pMac->roam.ucACWeights[1],
             pMac->roam.ucACWeights[2], pMac->roam.ucACWeights[3]);
         WLANTL_SetACWeights(pMac->roam.gVosContext, pMac->roam.ucACWeights);
     }
-    
+
     if ( fMICFailure )
     {
         reasonCode = eSIR_MAC_MIC_FAILURE_REASON;
@@ -2602,37 +2608,37 @@ eHalStatus csrRoamIssueDisassociate( tpAniSirGlobal pMac, tANI_U32 sessionId,
     else if (NewSubstate == eCSR_ROAM_SUBSTATE_DISASSOC_HANDOFF)
     {
         reasonCode = eSIR_MAC_DISASSOC_DUE_TO_FTHANDOFF_REASON;
-    } 
-    else 
+    }
+    else
     {
         reasonCode = eSIR_MAC_UNSPEC_FAILURE_REASON;
-    }    
+    }
 #ifdef WLAN_FEATURE_VOWIFI_11R
-    if ( (csrRoamIsHandoffInProgress(pMac)) && 
+    if ( (csrRoamIsHandoffInProgress(pMac)) &&
          (NewSubstate != eCSR_ROAM_SUBSTATE_DISASSOC_HANDOFF))
     {
         tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
         vos_mem_copy(&bssId,
                      pNeighborRoamInfo->csrNeighborRoamProfile.BSSIDs.bssid,
                      sizeof(tSirMacAddr));
-    } 
-    else 
+    }
+    else
 #endif
     if(pSession->pConnectBssDesc)
     {
         vos_mem_copy(&bssId, pSession->pConnectBssDesc->bssId, sizeof(tCsrBssid));
     }
-    
-    
+
+
     smsLog( pMac, LOG2, "CSR Attempting to Disassociate Bssid="MAC_ADDRESS_STR
             " subState = %d reason=%d",
             MAC_ADDR_ARRAY(bssId), NewSubstate, reasonCode);
 
     csrRoamSubstateChange( pMac, NewSubstate, sessionId);
 
-    status = csrSendMBDisassocReqMsg( pMac, sessionId, bssId, reasonCode );    
-    
-    if(HAL_STATUS_SUCCESS(status)) 
+    status = csrSendMBDisassocReqMsg( pMac, sessionId, bssId, reasonCode );
+
+    if(HAL_STATUS_SUCCESS(status))
     {
         csrRoamLinkDown(pMac, sessionId);
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
@@ -2660,8 +2666,8 @@ eHalStatus csrRoamIssueDisassociate( tpAniSirGlobal pMac, tANI_U32 sessionId,
     \param reason - reason code, be one of the tSirMacReasonCodes
     \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus csrRoamIssueDisassociateStaCmd( tpAniSirGlobal pMac, 
-                                           tANI_U32 sessionId, 
+eHalStatus csrRoamIssueDisassociateStaCmd( tpAniSirGlobal pMac,
+                                           tANI_U32 sessionId,
                                            tANI_U8 *pPeerMacAddr,
                                            tANI_U32 reason)
 {
@@ -2671,7 +2677,7 @@ eHalStatus csrRoamIssueDisassociateStaCmd( tpAniSirGlobal pMac,
     do
     {
         pCommand = csrGetCommandBuffer( pMac );
-        if ( !pCommand ) 
+        if ( !pCommand )
         {
             smsLog( pMac, LOGE, FL(" fail to get command buffer") );
             status = eHAL_STATUS_RESOURCES;
@@ -2702,8 +2708,8 @@ eHalStatus csrRoamIssueDisassociateStaCmd( tpAniSirGlobal pMac,
     \param reason - reason code, be one of the tSirMacReasonCodes
     \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus csrRoamIssueDeauthStaCmd( tpAniSirGlobal pMac, 
-                                     tANI_U32 sessionId, 
+eHalStatus csrRoamIssueDeauthStaCmd( tpAniSirGlobal pMac,
+                                     tANI_U32 sessionId,
                                      tANI_U8 *pPeerMacAddr,
                                      tANI_U32 reason)
 {
@@ -2713,7 +2719,7 @@ eHalStatus csrRoamIssueDeauthStaCmd( tpAniSirGlobal pMac,
     do
     {
         pCommand = csrGetCommandBuffer( pMac );
-        if ( !pCommand ) 
+        if ( !pCommand )
         {
             smsLog( pMac, LOGE, FL(" fail to get command buffer") );
             status = eHAL_STATUS_RESOURCES;
@@ -2794,7 +2800,7 @@ csrRoamGetWpsSessionOverlap( tpAniSirGlobal pMac, tANI_U32 sessionId,
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tCsrBssid bssId = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
-    
+
     if (!pSession)
     {
         smsLog( pMac, LOGE, "csrRoamGetWpsSessionOverlap:CSR Session not found");
@@ -2811,13 +2817,13 @@ csrRoamGetWpsSessionOverlap( tpAniSirGlobal pMac, tANI_U32 sessionId,
     }
     smsLog( pMac, LOG2, "CSR getting WPS Session Overlap for Bssid = "MAC_ADDRESS_STR,
                   MAC_ADDR_ARRAY(bssId));
-     
-    status = csrSendMBGetWPSPBCSessions( pMac, sessionId, bssId, pUsrContext, pfnSapEventCallback, pRemoveMac);            
-            
+
+    status = csrSendMBGetWPSPBCSessions( pMac, sessionId, bssId, pUsrContext, pfnSapEventCallback, pRemoveMac);
+
     return (status);
 }
 eHalStatus csrRoamIssueDeauth( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamSubState NewSubstate )
-{   
+{
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tCsrBssid bssId = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
@@ -2827,7 +2833,7 @@ eHalStatus csrRoamIssueDeauth( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoam
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     if(pSession->pConnectBssDesc)
     {
         vos_mem_copy(&bssId, pSession->pConnectBssDesc->bssId, sizeof(tCsrBssid));
@@ -2835,7 +2841,7 @@ eHalStatus csrRoamIssueDeauth( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoam
     smsLog( pMac, LOG2, "CSR Attempting to Deauth Bssid= "MAC_ADDRESS_STR,
                   MAC_ADDR_ARRAY(bssId));
     csrRoamSubstateChange( pMac, NewSubstate, sessionId);
-    
+
     status = csrSendMBDeauthReqMsg( pMac, sessionId, bssId, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON );
     if(!HAL_STATUS_SUCCESS(status))
     {
@@ -2856,14 +2862,14 @@ eHalStatus csrRoamSaveConnectedBssDesc( tpAniSirGlobal pMac, tANI_U32 sessionId,
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
-    // If no BSS description was found in this connection (happens with start IBSS), then 
+
+    // If no BSS description was found in this connection (happens with start IBSS), then
     // nix the BSS description that we keep around for the connected BSS) and get out...
     if(NULL == pBssDesc)
     {
         csrFreeConnectBssDesc(pMac, sessionId);
     }
-    else 
+    else
     {
         size = pBssDesc->length + sizeof( pBssDesc->length );
         if(NULL != pSession->pConnectBssDesc)
@@ -2886,7 +2892,7 @@ eHalStatus csrRoamSaveConnectedBssDesc( tpAniSirGlobal pMac, tANI_U32 sessionId,
     return (status);
 }
 
-eHalStatus csrRoamPrepareBssConfig(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, 
+eHalStatus csrRoamPrepareBssConfig(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile,
                                     tSirBssDescription *pBssDesc, tBssConfigParam *pBssConfig,
                                     tDot11fBeaconIEs *pIes)
 {
@@ -2934,7 +2940,7 @@ eHalStatus csrRoamPrepareBssConfig(tpAniSirGlobal pMac, tCsrRoamProfile *pProfil
         {
             pBssConfig->uCfgDot11Mode = cfgDot11Mode;
         }
-        else 
+        else
         {
             smsLog(pMac, LOGW, "   Can not find match phy mode");
             //force it
@@ -2956,7 +2962,7 @@ eHalStatus csrRoamPrepareBssConfig(tpAniSirGlobal pMac, tCsrRoamProfile *pProfil
             pBssConfig->qosType = eCSR_MEDIUM_ACCESS_DCF;
         }
 
-        if (((pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11N)  || 
+        if (((pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11N)  ||
                          (pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11AC)) &&
                          ((pBssConfig->qosType != eCSR_MEDIUM_ACCESS_WMM_eDCF_DSCP) ||
                           (pBssConfig->qosType != eCSR_MEDIUM_ACCESS_11e_HCF) ||
@@ -2968,7 +2974,7 @@ eHalStatus csrRoamPrepareBssConfig(tpAniSirGlobal pMac, tCsrRoamProfile *pProfil
         }
 
         //auth type
-        switch( pProfile->negotiatedAuthType ) 
+        switch( pProfile->negotiatedAuthType )
         {
             default:
             case eCSR_AUTH_TYPE_WPA:
@@ -2996,7 +3002,7 @@ eHalStatus csrRoamPrepareBssConfig(tpAniSirGlobal pMac, tCsrRoamProfile *pProfil
         if(pBssConfig->BssCap.ibss)
         {
             //We don't support 11h on IBSS
-            pBssConfig->f11hSupport = eANI_BOOLEAN_FALSE; 
+            pBssConfig->f11hSupport = eANI_BOOLEAN_FALSE;
         }
         else
         {
@@ -3007,21 +3013,21 @@ eHalStatus csrRoamPrepareBssConfig(tpAniSirGlobal pMac, tCsrRoamProfile *pProfil
         //heartbeat
         if ( CSR_IS_11A_BSS( pBssDesc ) )
         {
-             pBssConfig->uHeartBeatThresh = pMac->roam.configParam.HeartbeatThresh50;        
+             pBssConfig->uHeartBeatThresh = pMac->roam.configParam.HeartbeatThresh50;
         }
         else
         {
              pBssConfig->uHeartBeatThresh = pMac->roam.configParam.HeartbeatThresh24;
         }
         //Join timeout
-        // if we find a BeaconInterval in the BssDescription, then set the Join Timeout to 
-        // be 10 x the BeaconInterval.                          
+        // if we find a BeaconInterval in the BssDescription, then set the Join Timeout to
+        // be 10 x the BeaconInterval.
         if ( pBssDesc->beaconInterval )
         {
             //Make sure it is bigger than the minimal
             pBssConfig->uJoinTimeOut = CSR_ROAM_MAX(10 * pBssDesc->beaconInterval, CSR_JOIN_FAILURE_TIMEOUT_MIN);
         }
-        else 
+        else
         {
             pBssConfig->uJoinTimeOut = CSR_JOIN_FAILURE_TIMEOUT_DEFAULT;
         }
@@ -3031,11 +3037,11 @@ eHalStatus csrRoamPrepareBssConfig(tpAniSirGlobal pMac, tCsrRoamProfile *pProfil
     return (status);
 }
 
-static eHalStatus csrRoamPrepareBssConfigFromProfile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, 
+static eHalStatus csrRoamPrepareBssConfigFromProfile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile,
                                                      tBssConfigParam *pBssConfig, tSirBssDescription *pBssDesc)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
-    tANI_U8 operationChannel = 0; 
+    tANI_U8 operationChannel = 0;
     tANI_U8 qAPisEnabled = FALSE;
     //SSID
     pBssConfig->SSID.length = 0;
@@ -3069,11 +3075,11 @@ static eHalStatus csrRoamPrepareBssConfigFromProfile(tpAniSirGlobal pMac, tCsrRo
     {
        operationChannel = pProfile->ChannelInfo.ChannelList[0];
     }
-    pBssConfig->uCfgDot11Mode = csrRoamGetPhyModeBandForBss(pMac, pProfile, operationChannel, 
+    pBssConfig->uCfgDot11Mode = csrRoamGetPhyModeBandForBss(pMac, pProfile, operationChannel,
                                         &pBssConfig->eBand);
     //QOS
     //Is this correct to always set to this //***
-    if ( pBssConfig->BssCap.ess == 1 ) 
+    if ( pBssConfig->BssCap.ess == 1 )
     {
         /*For Softap case enable WMM*/
         if(CSR_IS_INFRA_AP(pProfile) && (eCsrRoamWmmNoQos != pMac->roam.configParam.WMMSupportMode )){
@@ -3097,7 +3103,7 @@ static eHalStatus csrRoamPrepareBssConfigFromProfile(tpAniSirGlobal pMac, tCsrRo
     } else {
         pBssConfig->qosType = eCSR_MEDIUM_ACCESS_DCF;
     }
-    
+
     //auth type
     switch( pProfile->AuthType.authType[0] ) //Take the preferred Auth type.
     {
@@ -3130,7 +3136,7 @@ static eHalStatus csrRoamPrepareBssConfigFromProfile(tpAniSirGlobal pMac, tCsrRo
     //heartbeat
     if ( eCSR_BAND_5G == pBssConfig->eBand )
     {
-        pBssConfig->uHeartBeatThresh = pMac->roam.configParam.HeartbeatThresh50;        
+        pBssConfig->uHeartBeatThresh = pMac->roam.configParam.HeartbeatThresh50;
     }
     else
     {
@@ -3145,13 +3151,13 @@ static eHalStatus csrRoamGetQosInfoFromBss(tpAniSirGlobal pMac, tSirBssDescripti
 {
     eHalStatus status = eHAL_STATUS_FAILURE;
     tDot11fBeaconIEs *pIes = NULL;
-   
+
   do
    {
       if(!HAL_STATUS_SUCCESS(csrGetParsedBssDescriptionIEs(pMac, pBssDesc, &pIes)))
       {
          //err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                    "csrRoamGetQosInfoFromBss() failed");
          break;
       }
@@ -3172,8 +3178,8 @@ static eHalStatus csrRoamGetQosInfoFromBss(tpAniSirGlobal pMac, tSirBssDescripti
 
 void csrSetCfgPrivacy( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tANI_BOOLEAN fPrivacy )
 {
-    // !! Note:  the only difference between this function and the csrSetCfgPrivacyFromProfile() is the 
-    // setting of the privacy CFG based on the advertised privacy setting from the AP for WPA associations. 
+    // !! Note:  the only difference between this function and the csrSetCfgPrivacyFromProfile() is the
+    // setting of the privacy CFG based on the advertised privacy setting from the AP for WPA associations.
     // See !!Note: below in this function...
     tANI_U32 PrivacyEnabled = 0;
     tANI_U32 RsnEnabled = 0;
@@ -3183,45 +3189,45 @@ void csrSetCfgPrivacy( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tANI_BOOL
     tANI_U32 Key1Length = 0;
     tANI_U32 Key2Length = 0;
     tANI_U32 Key3Length = 0;
-    
-    // Reserve for the biggest key 
+
+    // Reserve for the biggest key
     tANI_U8 Key0[ WNI_CFG_WEP_DEFAULT_KEY_1_LEN ];
     tANI_U8 Key1[ WNI_CFG_WEP_DEFAULT_KEY_2_LEN ];
     tANI_U8 Key2[ WNI_CFG_WEP_DEFAULT_KEY_3_LEN ];
     tANI_U8 Key3[ WNI_CFG_WEP_DEFAULT_KEY_4_LEN ];
-    
+
     switch ( pProfile->negotiatedUCEncryptionType )
     {
         case eCSR_ENCRYPT_TYPE_NONE:
-        
+
             // for NO encryption, turn off Privacy and Rsn.
-            PrivacyEnabled = 0;           
+            PrivacyEnabled = 0;
             RsnEnabled = 0;
-            
+
             // WEP key length and Wep Default Key ID don't matter in this case....
-            
+
             // clear out the WEP keys that may be hanging around.
             Key0Length = 0;
             Key1Length = 0;
             Key2Length = 0;
             Key3Length = 0;
-            
+
             break;
-            
+
         case eCSR_ENCRYPT_TYPE_WEP40_STATICKEY:
         case eCSR_ENCRYPT_TYPE_WEP40:
-            
+
             // Privacy is ON.  NO RSN for Wep40 static key.
-            PrivacyEnabled = 1;           
+            PrivacyEnabled = 1;
             RsnEnabled = 0;
-                        
+
             // Set the Wep default key ID.
             WepDefaultKeyId = pProfile->Keys.defaultIndex;
             // Wep key size if 5 bytes (40 bits).
-            WepKeyLength = WNI_CFG_WEP_KEY_LENGTH_5;            
-            
+            WepKeyLength = WNI_CFG_WEP_KEY_LENGTH_5;
+
             // set encryption keys in the CFG database or clear those that are not present in this profile.
-            if ( pProfile->Keys.KeyLength[0] ) 
+            if ( pProfile->Keys.KeyLength[0] )
             {
                 vos_mem_copy(Key0, pProfile->Keys.KeyMaterial[0],
                              WNI_CFG_WEP_KEY_LENGTH_5);
@@ -3231,8 +3237,8 @@ void csrSetCfgPrivacy( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tANI_BOOL
             {
                 Key0Length = 0;
             }
-            
-            if ( pProfile->Keys.KeyLength[1] ) 
+
+            if ( pProfile->Keys.KeyLength[1] )
             {
                vos_mem_copy(Key1, pProfile->Keys.KeyMaterial[1],
                             WNI_CFG_WEP_KEY_LENGTH_5);
@@ -3242,45 +3248,45 @@ void csrSetCfgPrivacy( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tANI_BOOL
             {
                 Key1Length = 0;
             }
-            
-            if ( pProfile->Keys.KeyLength[2] ) 
+
+            if ( pProfile->Keys.KeyLength[2] )
             {
                 vos_mem_copy(Key2, pProfile->Keys.KeyMaterial[2],
                              WNI_CFG_WEP_KEY_LENGTH_5);
-                Key2Length = WNI_CFG_WEP_KEY_LENGTH_5;                
+                Key2Length = WNI_CFG_WEP_KEY_LENGTH_5;
             }
             else
             {
                 Key2Length = 0;
             }
-            
-            if ( pProfile->Keys.KeyLength[3] ) 
+
+            if ( pProfile->Keys.KeyLength[3] )
             {
                 vos_mem_copy(Key3, pProfile->Keys.KeyMaterial[3],
                              WNI_CFG_WEP_KEY_LENGTH_5);
-                Key3Length = WNI_CFG_WEP_KEY_LENGTH_5;                
+                Key3Length = WNI_CFG_WEP_KEY_LENGTH_5;
             }
             else
             {
                 Key3Length = 0;
-            }      
+            }
             break;
-        
+
         case eCSR_ENCRYPT_TYPE_WEP104_STATICKEY:
         case eCSR_ENCRYPT_TYPE_WEP104:
-            
+
             // Privacy is ON.  NO RSN for Wep40 static key.
-            PrivacyEnabled = 1;           
+            PrivacyEnabled = 1;
             RsnEnabled = 0;
-            
+
             // Set the Wep default key ID.
             WepDefaultKeyId = pProfile->Keys.defaultIndex;
-           
+
             // Wep key size if 13 bytes (104 bits).
             WepKeyLength = WNI_CFG_WEP_KEY_LENGTH_13;
-            
+
             // set encryption keys in the CFG database or clear those that are not present in this profile.
-            if ( pProfile->Keys.KeyLength[0] ) 
+            if ( pProfile->Keys.KeyLength[0] )
             {
                 vos_mem_copy(Key0, pProfile->Keys.KeyMaterial[ 0 ],
                              WNI_CFG_WEP_KEY_LENGTH_13);
@@ -3290,8 +3296,8 @@ void csrSetCfgPrivacy( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tANI_BOOL
             {
                 Key0Length = 0;
             }
-            
-            if ( pProfile->Keys.KeyLength[1] ) 
+
+            if ( pProfile->Keys.KeyLength[1] )
             {
                 vos_mem_copy(Key1, pProfile->Keys.KeyMaterial[ 1 ],
                              WNI_CFG_WEP_KEY_LENGTH_13);
@@ -3301,8 +3307,8 @@ void csrSetCfgPrivacy( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tANI_BOOL
             {
                 Key1Length = 0;
             }
-            
-            if ( pProfile->Keys.KeyLength[2] ) 
+
+            if ( pProfile->Keys.KeyLength[2] )
             {
                 vos_mem_copy(Key2, pProfile->Keys.KeyMaterial[ 2 ],
                              WNI_CFG_WEP_KEY_LENGTH_13);
@@ -3312,8 +3318,8 @@ void csrSetCfgPrivacy( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tANI_BOOL
             {
                 Key2Length = 0;
             }
-            
-            if ( pProfile->Keys.KeyLength[3] ) 
+
+            if ( pProfile->Keys.KeyLength[3] )
             {
                 vos_mem_copy(Key3, pProfile->Keys.KeyMaterial[ 3 ],
                              WNI_CFG_WEP_KEY_LENGTH_13);
@@ -3323,36 +3329,36 @@ void csrSetCfgPrivacy( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tANI_BOOL
             {
                 Key3Length = 0;
             }
-           
+
             break;
-        
+
         case eCSR_ENCRYPT_TYPE_TKIP:
         case eCSR_ENCRYPT_TYPE_AES:
 #ifdef FEATURE_WLAN_WAPI
         case eCSR_ENCRYPT_TYPE_WPI:
 #endif /* FEATURE_WLAN_WAPI */
             // !! Note:  this is the only difference between this function and the csrSetCfgPrivacyFromProfile()
-            // (setting of the privacy CFG based on the advertised privacy setting from the AP for WPA/WAPI associations ).        
+            // (setting of the privacy CFG based on the advertised privacy setting from the AP for WPA/WAPI associations ).
             PrivacyEnabled = (0 != fPrivacy);
-                         
-            // turn on RSN enabled for WPA associations   
+
+            // turn on RSN enabled for WPA associations
             RsnEnabled = 1;
-            
+
             // WEP key length and Wep Default Key ID don't matter in this case....
-            
+
             // clear out the static WEP keys that may be hanging around.
             Key0Length = 0;
             Key1Length = 0;
             Key2Length = 0;
-            Key3Length = 0;        
-          
-            break;     
+            Key3Length = 0;
+
+            break;
         default:
             PrivacyEnabled = 0;
             RsnEnabled = 0;
-            break;            
-    }           
-    
+            break;
+    }
+
     ccmCfgSetInt(pMac, WNI_CFG_PRIVACY_ENABLED, PrivacyEnabled, NULL, eANI_BOOLEAN_FALSE);
     ccmCfgSetInt(pMac, WNI_CFG_RSN_ENABLED, RsnEnabled, NULL, eANI_BOOLEAN_FALSE);
     ccmCfgSetStr(pMac, WNI_CFG_WEP_DEFAULT_KEY_1, Key0, Key0Length, NULL, eANI_BOOLEAN_FALSE);
@@ -3423,7 +3429,7 @@ static eHalStatus csrGetRateSet( tpAniSirGlobal pMac,  tCsrRoamProfile *pProfile
     vos_mem_set(pOpRateSet, sizeof(tSirMacRateSet), 0);
     vos_mem_set(pExRateSet, sizeof(tSirMacRateSet), 0);
     VOS_ASSERT( pIes != NULL );
-    
+
     if( NULL != pIes )
     {
         csrIsPhyModeMatch( pMac, phyMode, pBssDesc, pProfile, &cfgDot11Mode, pIes );
@@ -3439,16 +3445,16 @@ static eHalStatus csrGetRateSet( tpAniSirGlobal pMac,  tCsrRoamProfile *pProfile
         pDstRate = pOpRateSet->rate;
         if(pIes->SuppRates.present)
         {
-            for ( i = 0; i < pIes->SuppRates.num_rates; i++ ) 
+            for ( i = 0; i < pIes->SuppRates.num_rates; i++ )
             {
-                if ( csrRatesIsDot11RateSupported( pMac, pIes->SuppRates.rates[ i ] ) ) 
+                if ( csrRatesIsDot11RateSupported( pMac, pIes->SuppRates.rates[ i ] ) )
                 {
                     *pDstRate++ = pIes->SuppRates.rates[ i ];
                     pOpRateSet->numRates++;
                 }
             }
         }
-        if ( eCSR_CFG_DOT11_MODE_11G == cfgDot11Mode || 
+        if ( eCSR_CFG_DOT11_MODE_11G == cfgDot11Mode ||
              eCSR_CFG_DOT11_MODE_11N == cfgDot11Mode ||
              eCSR_CFG_DOT11_MODE_TAURUS == cfgDot11Mode ||
              eCSR_CFG_DOT11_MODE_ABG == cfgDot11Mode )
@@ -3459,9 +3465,9 @@ static eHalStatus csrGetRateSet( tpAniSirGlobal pMac,  tCsrRoamProfile *pProfile
             pDstRate = pExRateSet->rate;
             if(pIes->ExtSuppRates.present)
             {
-                for ( i = 0; i < pIes->ExtSuppRates.num_rates; i++ ) 
+                for ( i = 0; i < pIes->ExtSuppRates.num_rates; i++ )
                 {
-                    if ( csrRatesIsDot11RateSupported( pMac, pIes->ExtSuppRates.rates[ i ] ) ) 
+                    if ( csrRatesIsDot11RateSupported( pMac, pIes->ExtSuppRates.rates[ i ] ) )
                     {
                         *pDstRate++ = pIes->ExtSuppRates.rates[ i ];
                         pExRateSet->numRates++;
@@ -3477,7 +3483,7 @@ static eHalStatus csrGetRateSet( tpAniSirGlobal pMac,  tCsrRoamProfile *pProfile
     if (pOpRateSet->numRates > 0 || pExRateSet->numRates > 0) status = eHAL_STATUS_SUCCESS;
     return status;
 }
-    
+
 static void csrSetCfgRateSet( tpAniSirGlobal pMac, eCsrPhyMode phyMode, tCsrRoamProfile *pProfile,
                               tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes)
 {
@@ -3509,7 +3515,7 @@ static void csrSetCfgRateSet( tpAniSirGlobal pMac, eCsrPhyMode phyMode, tCsrRoam
         pDstRate = OperationalRates;
         if(pIes->SuppRates.present)
         {
-            for ( i = 0; i < pIes->SuppRates.num_rates; i++ ) 
+            for ( i = 0; i < pIes->SuppRates.num_rates; i++ )
             {
                 if ( csrRatesIsDot11RateSupported( pMac, pIes->SuppRates.rates[ i ] ) &&
                      ( OperationalRatesLength < CSR_DOT11_SUPPORTED_RATES_MAX ))
@@ -3519,7 +3525,7 @@ static void csrSetCfgRateSet( tpAniSirGlobal pMac, eCsrPhyMode phyMode, tCsrRoam
                 }
             }
         }
-        if ( eCSR_CFG_DOT11_MODE_11G == cfgDot11Mode || 
+        if ( eCSR_CFG_DOT11_MODE_11G == cfgDot11Mode ||
              eCSR_CFG_DOT11_MODE_11N == cfgDot11Mode ||
              eCSR_CFG_DOT11_MODE_TAURUS == cfgDot11Mode ||
              eCSR_CFG_DOT11_MODE_ABG == cfgDot11Mode )
@@ -3530,7 +3536,7 @@ static void csrSetCfgRateSet( tpAniSirGlobal pMac, eCsrPhyMode phyMode, tCsrRoam
             pDstRate = ExtendedOperationalRates;
             if(pIes->ExtSuppRates.present)
             {
-                for ( i = 0; i < pIes->ExtSuppRates.num_rates; i++ ) 
+                for ( i = 0; i < pIes->ExtSuppRates.num_rates; i++ )
                 {
                     if ( csrRatesIsDot11RateSupported( pMac, pIes->ExtSuppRates.rates[ i ] ) &&
                      ( ExtendedOperationalRatesLength < CSR_DOT11_EXTENDED_SUPPORTED_RATES_MAX ))
@@ -3555,7 +3561,7 @@ static void csrSetCfgRateSet( tpAniSirGlobal pMac, eCsrPhyMode phyMode, tCsrRoam
         // set with any proprietary rates we found in the beacon, only if user
         // allows them...
         if ( PropRatesEnable && pIes->Airgo.PropSuppRates.present &&
-             ( pIes->Airgo.PropSuppRates.num_rates > 0 )) 
+             ( pIes->Airgo.PropSuppRates.num_rates > 0 ))
         {
             ProprietaryOperationalRatesLength = pIes->Airgo.PropSuppRates.num_rates;
             if ( ProprietaryOperationalRatesLength > sizeof(ProprietaryOperationalRates) )
@@ -3584,16 +3590,16 @@ static void csrSetCfgRateSet( tpAniSirGlobal pMac, eCsrPhyMode phyMode, tCsrRoam
            }
         }
         // Set the operational rate set CFG variables...
-        ccmCfgSetStr(pMac, WNI_CFG_OPERATIONAL_RATE_SET, OperationalRates, 
+        ccmCfgSetStr(pMac, WNI_CFG_OPERATIONAL_RATE_SET, OperationalRates,
                         OperationalRatesLength, NULL, eANI_BOOLEAN_FALSE);
-        ccmCfgSetStr(pMac, WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET, ExtendedOperationalRates, 
+        ccmCfgSetStr(pMac, WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET, ExtendedOperationalRates,
                             ExtendedOperationalRatesLength, NULL, eANI_BOOLEAN_FALSE);
-        ccmCfgSetStr(pMac, WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET, 
-                        ProprietaryOperationalRates, 
+        ccmCfgSetStr(pMac, WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET,
+                        ProprietaryOperationalRates,
                         ProprietaryOperationalRatesLength, NULL, eANI_BOOLEAN_FALSE);
         ccmCfgSetInt(pMac, WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED, PropRatesEnable, NULL, eANI_BOOLEAN_FALSE);
-        ccmCfgSetStr(pMac, WNI_CFG_CURRENT_MCS_SET, MCSRateIdxSet, 
-                        MCSRateLength, NULL, eANI_BOOLEAN_FALSE);        
+        ccmCfgSetStr(pMac, WNI_CFG_CURRENT_MCS_SET, MCSRateIdxSet,
+                        MCSRateLength, NULL, eANI_BOOLEAN_FALSE);
     }//Parsing BSSDesc
     else
     {
@@ -3604,25 +3610,25 @@ static void csrSetCfgRateSet( tpAniSirGlobal pMac, eCsrPhyMode phyMode, tCsrRoam
 static void csrSetCfgRateSetFromProfile( tpAniSirGlobal pMac,
                                          tCsrRoamProfile *pProfile  )
 {
-    tSirMacRateSetIE DefaultSupportedRates11a = {  SIR_MAC_RATESET_EID, 
-                                                   { 8, 
-                                                     { SIR_MAC_RATE_6, 
-                                                   SIR_MAC_RATE_9, 
-                                                   SIR_MAC_RATE_12, 
+    tSirMacRateSetIE DefaultSupportedRates11a = {  SIR_MAC_RATESET_EID,
+                                                   { 8,
+                                                     { SIR_MAC_RATE_6,
+                                                   SIR_MAC_RATE_9,
+                                                   SIR_MAC_RATE_12,
                                                    SIR_MAC_RATE_18,
                                                    SIR_MAC_RATE_24,
                                                    SIR_MAC_RATE_36,
                                                    SIR_MAC_RATE_48,
                                                        SIR_MAC_RATE_54  } } };
-    tSirMacRateSetIE DefaultSupportedRates11b = {  SIR_MAC_RATESET_EID, 
-                                                   { 4, 
-                                                     { SIR_MAC_RATE_1, 
-                                                   SIR_MAC_RATE_2, 
-                                                   SIR_MAC_RATE_5_5, 
+    tSirMacRateSetIE DefaultSupportedRates11b = {  SIR_MAC_RATESET_EID,
+                                                   { 4,
+                                                     { SIR_MAC_RATE_1,
+                                                   SIR_MAC_RATE_2,
+                                                   SIR_MAC_RATE_5_5,
                                                        SIR_MAC_RATE_11  } } };
-                                                              
-                                                              
-    tSirMacPropRateSet DefaultSupportedPropRates = { 3, 
+
+
+    tSirMacPropRateSet DefaultSupportedPropRates = { 3,
                                                      { SIR_MAC_RATE_72,
                                                      SIR_MAC_RATE_96,
                                                        SIR_MAC_RATE_108 } };
@@ -3635,46 +3641,46 @@ static void csrSetCfgRateSetFromProfile( tpAniSirGlobal pMac,
     tANI_U8 ProprietaryOperationalRates[ 4 ];    // leave enough room for the max number of proprietary rates
     tANI_U32 ProprietaryOperationalRatesLength = 0;
     tANI_U32 PropRatesEnable = 0;
-    tANI_U8 operationChannel = 0; 
+    tANI_U8 operationChannel = 0;
     if(pProfile->ChannelInfo.ChannelList)
     {
        operationChannel = pProfile->ChannelInfo.ChannelList[0];
     }
     cfgDot11Mode = csrRoamGetPhyModeBandForBss( pMac, pProfile, operationChannel, &eBand );
-    // For 11a networks, the 11a rates go into the Operational Rate set.  For 11b and 11g 
+    // For 11a networks, the 11a rates go into the Operational Rate set.  For 11b and 11g
     // networks, the 11b rates appear in the Operational Rate set.  In either case,
-    // we can blindly put the rates we support into our Operational Rate set 
-    // (including the basic rates, which we have already verified are supported 
+    // we can blindly put the rates we support into our Operational Rate set
+    // (including the basic rates, which we have already verified are supported
     // earlier in the roaming decision).
-    if ( eCSR_BAND_5G == eBand ) 
-    {       
-        // 11a rates into the Operational Rate Set.                 
+    if ( eCSR_BAND_5G == eBand )
+    {
+        // 11a rates into the Operational Rate Set.
         OperationalRatesLength = DefaultSupportedRates11a.supportedRateSet.numRates *
                                             sizeof(*DefaultSupportedRates11a.supportedRateSet.rate);
         vos_mem_copy(OperationalRates,
                      DefaultSupportedRates11a.supportedRateSet.rate,
                      OperationalRatesLength);
-                         
+
         // Nothing in the Extended rate set.
         ExtendedOperationalRatesLength = 0;
         // populate proprietary rates if user allows them
-        if ( pMac->roam.configParam.ProprietaryRatesEnabled ) 
+        if ( pMac->roam.configParam.ProprietaryRatesEnabled )
         {
-            ProprietaryOperationalRatesLength = DefaultSupportedPropRates.numPropRates * 
-                                                            sizeof(*DefaultSupportedPropRates.propRate);         
+            ProprietaryOperationalRatesLength = DefaultSupportedPropRates.numPropRates *
+                                                            sizeof(*DefaultSupportedPropRates.propRate);
             vos_mem_copy(ProprietaryOperationalRates,
                          DefaultSupportedPropRates.propRate,
                          ProprietaryOperationalRatesLength);
-        }    
-        else 
-        {       
+        }
+        else
+        {
             // No proprietary modes
-            ProprietaryOperationalRatesLength = 0;         
-        }    
-    }    
-    else if ( eCSR_CFG_DOT11_MODE_11B == cfgDot11Mode ) 
-    {       
-        // 11b rates into the Operational Rate Set.         
+            ProprietaryOperationalRatesLength = 0;
+        }
+    }
+    else if ( eCSR_CFG_DOT11_MODE_11B == cfgDot11Mode )
+    {
+        // 11b rates into the Operational Rate Set.
         OperationalRatesLength = DefaultSupportedRates11b.supportedRateSet.numRates *
                                               sizeof(*DefaultSupportedRates11b.supportedRateSet.rate);
         vos_mem_copy(OperationalRates,
@@ -3684,57 +3690,57 @@ static void csrSetCfgRateSetFromProfile( tpAniSirGlobal pMac,
         ExtendedOperationalRatesLength = 0;
         // No proprietary modes
         ProprietaryOperationalRatesLength = 0;
-    }    
-    else 
-    {       
+    }
+    else
+    {
         // 11G
-        
-        // 11b rates into the Operational Rate Set.         
-        OperationalRatesLength = DefaultSupportedRates11b.supportedRateSet.numRates * 
+
+        // 11b rates into the Operational Rate Set.
+        OperationalRatesLength = DefaultSupportedRates11b.supportedRateSet.numRates *
                                             sizeof(*DefaultSupportedRates11b.supportedRateSet.rate);
         vos_mem_copy(OperationalRates,
                      DefaultSupportedRates11b.supportedRateSet.rate,
                      OperationalRatesLength);
-        
+
         // 11a rates go in the Extended rate set.
-        ExtendedOperationalRatesLength = DefaultSupportedRates11a.supportedRateSet.numRates * 
+        ExtendedOperationalRatesLength = DefaultSupportedRates11a.supportedRateSet.numRates *
                                                     sizeof(*DefaultSupportedRates11a.supportedRateSet.rate);
         vos_mem_copy(ExtendedOperationalRates,
                      DefaultSupportedRates11a.supportedRateSet.rate,
                      ExtendedOperationalRatesLength);
-        
+
         // populate proprietary rates if user allows them
-        if ( pMac->roam.configParam.ProprietaryRatesEnabled ) 
+        if ( pMac->roam.configParam.ProprietaryRatesEnabled )
         {
             ProprietaryOperationalRatesLength = DefaultSupportedPropRates.numPropRates *
-                                                            sizeof(*DefaultSupportedPropRates.propRate);         
+                                                            sizeof(*DefaultSupportedPropRates.propRate);
             vos_mem_copy(ProprietaryOperationalRates,
                          DefaultSupportedPropRates.propRate,
                          ProprietaryOperationalRatesLength);
-        }  
-        else 
-        {       
+        }
+        else
+        {
            // No proprietary modes
-            ProprietaryOperationalRatesLength = 0;         
-        }    
-    }  
+            ProprietaryOperationalRatesLength = 0;
+        }
+    }
     // set this to 1 if prop. rates need to be advertised in to the IBSS beacon and user wants to use them
-    if ( ProprietaryOperationalRatesLength && pMac->roam.configParam.ProprietaryRatesEnabled ) 
+    if ( ProprietaryOperationalRatesLength && pMac->roam.configParam.ProprietaryRatesEnabled )
     {
-        PropRatesEnable = 1;                
+        PropRatesEnable = 1;
     }
-    else 
+    else
     {
-        PropRatesEnable = 0;    
+        PropRatesEnable = 0;
     }
-        
+
     // Set the operational rate set CFG variables...
-    ccmCfgSetStr(pMac, WNI_CFG_OPERATIONAL_RATE_SET, OperationalRates, 
+    ccmCfgSetStr(pMac, WNI_CFG_OPERATIONAL_RATE_SET, OperationalRates,
                     OperationalRatesLength, NULL, eANI_BOOLEAN_FALSE);
-    ccmCfgSetStr(pMac, WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET, ExtendedOperationalRates, 
+    ccmCfgSetStr(pMac, WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET, ExtendedOperationalRates,
                         ExtendedOperationalRatesLength, NULL, eANI_BOOLEAN_FALSE);
-    ccmCfgSetStr(pMac, WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET, 
-                    ProprietaryOperationalRates, 
+    ccmCfgSetStr(pMac, WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET,
+                    ProprietaryOperationalRates,
                     ProprietaryOperationalRatesLength, NULL, eANI_BOOLEAN_FALSE);
     ccmCfgSetInt(pMac, WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED, PropRatesEnable, NULL, eANI_BOOLEAN_FALSE);
 }
@@ -3774,8 +3780,8 @@ tANI_U32 csrRoamGetPhyModeFromDot11Mode(eCsrCfgDot11Mode dot11Mode, eCsrBand ban
     }
     return (WNI_CFG_PHY_MODE_11A);
 }
-        
-        
+
+
 #ifdef WLAN_FEATURE_11AC
 ePhyChanBondState csrGetHTCBStateFromVHTCBState(ePhyChanBondState aniCBMode)
 {
@@ -3846,7 +3852,7 @@ eHalStatus csrRoamSetBssConfigCfg(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrR
     //ccmCfgSetInt(pMac, WNI_CFG_RTS_THRESHOLD, csrGetRTSThresh(pMac), NULL, eANI_BOOLEAN_FALSE);
 
     //ccmCfgSetInt(pMac, WNI_CFG_DOT11_MODE, csrTranslateToWNICfgDot11Mode(pMac, pBssConfig->uCfgDot11Mode), NULL, eANI_BOOLEAN_FALSE);
-        
+
     //Auth type
     ccmCfgSetInt(pMac, WNI_CFG_AUTHENTICATION_TYPE, pBssConfig->authType, NULL, eANI_BOOLEAN_FALSE);
     //encryption type
@@ -3894,7 +3900,7 @@ eHalStatus csrRoamSetBssConfigCfg(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrR
         if(!WDA_getFwWlanFeatCaps(DOT11AC)) {
             cfgCb = csrGetHTCBStateFromVHTCBState(cfgCb);
         }
-        else 
+        else
         {
             ccmCfgSetInt(pMac, WNI_CFG_VHT_CHANNEL_WIDTH,  pMac->roam.configParam.nVhtChannelWidth, NULL, eANI_BOOLEAN_FALSE);
         }
@@ -3920,19 +3926,19 @@ eHalStatus csrRoamSetBssConfigCfg(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrR
     return (status);
 }
 
-eHalStatus csrRoamStopNetwork( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+eHalStatus csrRoamStopNetwork( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                                tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes)
 {
     eHalStatus status;
     tBssConfigParam *pBssConfig;
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
-    
+
     if(!pSession)
     {
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     pBssConfig = vos_mem_malloc(sizeof(tBssConfigParam));
     if ( NULL == pBssConfig )
         status = eHAL_STATUS_FAILURE;
@@ -3954,17 +3960,17 @@ eHalStatus csrRoamStopNetwork( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoam
             }
             // If we are in an IBSS, then stop the IBSS...
             ////Not worry about WDS connection for now
-            if ( csrIsConnStateIbss( pMac, sessionId ) ) 
+            if ( csrIsConnStateIbss( pMac, sessionId ) )
             {
                 status = csrRoamIssueStopBss( pMac, sessionId, eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING );
             }
-            else 
+            else
             {
                 // if we are in an Infrastructure association....
-                if ( csrIsConnStateInfra( pMac, sessionId ) ) 
+                if ( csrIsConnStateInfra( pMac, sessionId ) )
                 {
                     // and the new Bss is an Ibss OR we are roaming from Infra to Infra
-                    // across SSIDs (roaming to a new SSID)...            //            
+                    // across SSIDs (roaming to a new SSID)...            //
                     //Not worry about WDS connection for now
                     if ( pBssDesc && ( ( csrIsIbssBssDesc( pBssDesc ) ) ||
                           !csrIsSsidEqual( pMac, pSession->pConnectBssDesc, pBssDesc, pIes ) ) )
@@ -4009,7 +4015,7 @@ eHalStatus csrRoamStopNetwork( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoam
     return (status);
 }
 
-eCsrJoinState csrRoamJoin( tpAniSirGlobal pMac, tANI_U32 sessionId, 
+eCsrJoinState csrRoamJoin( tpAniSirGlobal pMac, tANI_U32 sessionId,
                            tCsrScanResultInfo *pScanResult, tCsrRoamProfile *pProfile )
 {
     eCsrJoinState eRoamState = eCsrContinueRoaming;
@@ -4023,7 +4029,7 @@ eCsrJoinState csrRoamJoin( tpAniSirGlobal pMac, tANI_U32 sessionId,
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return (eCsrStopRoaming);
     }
-    
+
     if( CSR_IS_WDS_STA( pProfile ) )
     {
         status = csrRoamStartWds( pMac, sessionId, pProfile, pBssDesc );
@@ -4039,20 +4045,20 @@ eCsrJoinState csrRoamJoin( tpAniSirGlobal pMac, tANI_U32 sessionId,
             smsLog(pMac, LOGE, FL(" fail to parse IEs"));
             return (eCsrStopRoaming);
         }
-        if ( csrIsInfraBssDesc( pBssDesc ) ) 
+        if ( csrIsInfraBssDesc( pBssDesc ) )
     {
         // If we are connected in infrastructure mode and the Join Bss description is for the same BssID, then we are
         // attempting to join the AP we are already connected with.  In that case, see if the Bss or Sta capabilities
         // have changed and handle the changes (without disturbing the current association).
-                
-        if ( csrIsConnStateConnectedInfra(pMac, sessionId) && 
+
+        if ( csrIsConnStateConnectedInfra(pMac, sessionId) &&
              csrIsBssIdEqual( pMac, pBssDesc, pSession->pConnectBssDesc ) &&
                  csrIsSsidEqual( pMac, pSession->pConnectBssDesc, pBssDesc, pIesLocal )
-           )               
-        {   
+           )
+        {
             // Check to see if the Auth type has changed in the Profile.  If so, we don't want to Reassociate
-            // with Authenticating first.  To force this, stop the current association (Disassociate) and 
-            // then re 'Join' the AP, wihch will force an Authentication (with the new Auth type) followed by 
+            // with Authenticating first.  To force this, stop the current association (Disassociate) and
+            // then re 'Join' the AP, wihch will force an Authentication (with the new Auth type) followed by
             // a new Association.
             if(csrIsSameProfile(pMac, &pSession->connectedProfile, pProfile))
             {
@@ -4125,7 +4131,7 @@ eCsrJoinState csrRoamJoin( tpAniSirGlobal pMac, tANI_U32 sessionId,
     return( eRoamState );
 }
 
-eHalStatus csrRoamShouldRoam(tpAniSirGlobal pMac, tANI_U32 sessionId, 
+eHalStatus csrRoamShouldRoam(tpAniSirGlobal pMac, tANI_U32 sessionId,
                              tSirBssDescription *pBssDesc, tANI_U32 roamId)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -4158,10 +4164,10 @@ static void csrRoamAssignDefaultParam( tpAniSirGlobal pMac, tSmeCmd *pCommand )
              pCommand->u.roamCmd.roamProfile.negotiatedAuthType = eCSR_AUTH_TYPE_AUTOSWITCH;
              break;
     }
-    pCommand->u.roamCmd.roamProfile.negotiatedUCEncryptionType = 
-    pCommand->u.roamCmd.roamProfile.EncryptionType.encryptionType[0]; 
+    pCommand->u.roamCmd.roamProfile.negotiatedUCEncryptionType =
+    pCommand->u.roamCmd.roamProfile.EncryptionType.encryptionType[0];
     //In this case, the multicast encryption needs to follow the uncast ones.
-    pCommand->u.roamCmd.roamProfile.negotiatedMCEncryptionType = 
+    pCommand->u.roamCmd.roamProfile.negotiatedMCEncryptionType =
     pCommand->u.roamCmd.roamProfile.EncryptionType.encryptionType[0];
 }
 
@@ -4196,23 +4202,23 @@ static eCsrJoinState csrRoamJoinNextBss( tpAniSirGlobal pMac, tSmeCmd *pCommand,
     tCsrRoamInfo roamInfo, *pRoamInfo = NULL;
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
     v_U8_t acm_mask = 0;
-#endif 
+#endif
     tANI_U32 sessionId = pCommand->sessionId;
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
     tCsrRoamProfile *pProfile = &pCommand->u.roamCmd.roamProfile;
     tANI_U8  concurrentChannel = 0;
-    
+
     if(!pSession)
     {
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return (eCsrStopRoaming);
     }
-    
-    do  
+
+    do
     {
         // Check for Cardbus eject condition, before trying to Roam to any BSS
         //***if( !balIsCardPresent(pAdapter) ) break;
-        
+
         vos_mem_set(&roamInfo, sizeof(roamInfo), 0);
         memcpy (&roamInfo.bssid, &pSession->joinFailStatusCode.bssId, sizeof(tSirMacAddr));
         if(NULL != pBSSList)
@@ -4251,30 +4257,30 @@ static eCsrJoinState csrRoamJoinNextBss( tpAniSirGlobal pMac, tSmeCmd *pCommand,
                     pScanResult = GET_BASE_ADDR(pCommand->u.roamCmd.pRoamBssEntry, tCsrScanResult, Link);
                     /*If concurrency enabled take the concurrent connected channel first. */
                     /* Valid multichannel concurrent sessions exempted */
-                    if (vos_concurrent_sessions_running() && 
+                    if (vos_concurrent_sessions_running() &&
                         !csrIsValidMcConcurrentSession(pMac, sessionId, &pScanResult->Result.BssDescriptor))
                     {
-                        concurrentChannel = 
+                        concurrentChannel =
                             csrGetConcurrentOperationChannel(pMac);
                         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, "%s: "
                                 " csr Concurrent Channel = %d", __func__, concurrentChannel);
-                        if ((concurrentChannel) && 
-                                (concurrentChannel == 
+                        if ((concurrentChannel) &&
+                                (concurrentChannel ==
                                  pScanResult->Result.BssDescriptor.channelId))
                         {
-                            //make this 0 because we do not want the 
-                            //below check to pass as we don't want to 
+                            //make this 0 because we do not want the
+                            //below check to pass as we don't want to
                             //connect on other channel
                             VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                                     FL("Concurrent channel match =%d"),
                                     concurrentChannel);
-                            concurrentChannel = 0; 
+                            concurrentChannel = 0;
                         }
                     }
 
                     if (!concurrentChannel)
                     {
-                        
+
                         if(HAL_STATUS_SUCCESS(csrRoamShouldRoam(pMac,
                             sessionId, &pScanResult->Result.BssDescriptor,
                             pCommand->u.roamCmd.roamId)))
@@ -4346,7 +4352,7 @@ static eCsrJoinState csrRoamJoinNextBss( tpAniSirGlobal pMac, tSmeCmd *pCommand,
                     CSR_IS_UAPSD_BSS(pIesLocal) )
                 {
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
-                    acm_mask = sme_QosGetACMMask(pMac, &pScanResult->Result.BssDescriptor, 
+                    acm_mask = sme_QosGetACMMask(pMac, &pScanResult->Result.BssDescriptor,
                          pIesLocal);
                     pCommand->u.roamCmd.roamProfile.uapsd_mask &= ~(acm_mask);
 #endif /* WLAN_MDM_CODE_REDUCTION_OPT*/
@@ -4366,13 +4372,13 @@ static eCsrJoinState csrRoamJoinNextBss( tpAniSirGlobal pMac, tSmeCmd *pCommand,
             }
             roamInfo.pProfile = pProfile;
             pSession->bRefAssocStartCnt++;
-            csrRoamCallCallback( pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, 
+            csrRoamCallCallback( pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
                                  eCSR_ROAM_ASSOCIATION_START, eCSR_ROAM_RESULT_NONE );
         }
-        if ( NULL == pCommand->u.roamCmd.pRoamBssEntry ) 
+        if ( NULL == pCommand->u.roamCmd.pRoamBssEntry )
         {
             // If this is a start IBSS profile, then we need to start the IBSS.
-            if ( CSR_IS_START_IBSS(pProfile) ) 
+            if ( CSR_IS_START_IBSS(pProfile) )
             {
                 tANI_BOOLEAN fSameIbss = eANI_BOOLEAN_FALSE;
                 // Attempt to start this IBSS...
@@ -4380,7 +4386,7 @@ static eCsrJoinState csrRoamJoinNextBss( tpAniSirGlobal pMac, tSmeCmd *pCommand,
                 status = csrRoamStartIbss( pMac, sessionId, pProfile, &fSameIbss );
                 if(HAL_STATUS_SUCCESS(status))
                 {
-                    if ( fSameIbss ) 
+                    if ( fSameIbss )
                     {
                         eRoamState = eCsrStartIbssSameIbss;
                     }
@@ -4408,21 +4414,21 @@ static eCsrJoinState csrRoamJoinNextBss( tpAniSirGlobal pMac, tSmeCmd *pCommand,
                 {
                     eRoamState = eCsrContinueRoaming;
                 }
-                else 
+                else
                 {
                     //it somehow fail need to stop
                     eRoamState = eCsrStopRoaming;
                 }
             }
-            else 
+            else
             {
                 //Nothing we can do
                 smsLog(pMac, LOGW, FL("cannot continue without BSS list"));
                 eRoamState = eCsrStopRoaming;
                 break;
             }
-        } 
-        else //We have BSS 
+        }
+        else //We have BSS
         {
             //Need to assign these value because they are used in csrIsSameProfile
             pScanResult = GET_BASE_ADDR(pCommand->u.roamCmd.pRoamBssEntry, tCsrScanResult, Link);
@@ -4435,7 +4441,7 @@ static eCsrJoinState csrRoamJoinNextBss( tpAniSirGlobal pMac, tSmeCmd *pCommand,
                 {
                     eRoamState = eCsrStartIbssSameIbss;
                     break;
-                } 
+                }
             }
             if( pCommand->u.roamCmd.fReassocToSelfNoCapChange )
             {
@@ -4448,7 +4454,7 @@ static eCsrJoinState csrRoamJoinNextBss( tpAniSirGlobal pMac, tSmeCmd *pCommand,
             eRoamState = csrRoamJoin( pMac, sessionId, &pScanResult->Result, pProfile );
             break;
         }
-        
+
     } while( 0 );
     if( (eCsrStopRoaming == eRoamState) && (CSR_IS_INFRASTRUCTURE( pProfile )) )
     {
@@ -4458,8 +4464,8 @@ static eCsrJoinState csrRoamJoinNextBss( tpAniSirGlobal pMac, tSmeCmd *pCommand,
             pSession->bRefAssocStartCnt--;
             //Complete the last association attemp because a new one is about to be tried
             pRoamInfo = &roamInfo;
-            csrRoamCallCallback(pMac, sessionId, pRoamInfo, pCommand->u.roamCmd.roamId, 
-                                        eCSR_ROAM_ASSOCIATION_COMPLETION, 
+            csrRoamCallCallback(pMac, sessionId, pRoamInfo, pCommand->u.roamCmd.roamId,
+                                        eCSR_ROAM_ASSOCIATION_COMPLETION,
                                         eCSR_ROAM_RESULT_NOT_ASSOCIATED);
         }
     }
@@ -4472,7 +4478,7 @@ static eHalStatus csrRoam( tpAniSirGlobal pMac, tSmeCmd *pCommand )
     eHalStatus status = eHAL_STATUS_SUCCESS;
     eCsrJoinState RoamState;
     tANI_U32 sessionId = pCommand->sessionId;
-    
+
     //***if( hddIsRadioStateOn( pAdapter ) )
     {
         // Attept to join a Bss...
@@ -4483,7 +4489,7 @@ static eHalStatus csrRoam( tpAniSirGlobal pMac, tSmeCmd *pCommand )
         {
             tANI_BOOLEAN fComplete = eANI_BOOLEAN_FALSE;
             // and if connected in Infrastructure mode...
-            if ( csrIsConnStateInfra(pMac, sessionId) ) 
+            if ( csrIsConnStateInfra(pMac, sessionId) )
             {
                 //... then we need to issue a disassociation
                 status = csrRoamIssueDisassociate( pMac, sessionId, eCSR_ROAM_SUBSTATE_DISASSOC_NOTHING_TO_JOIN, FALSE );
@@ -4515,7 +4521,7 @@ static eHalStatus csrRoam( tpAniSirGlobal pMac, tSmeCmd *pCommand )
                 }
             }
             else
-            {        
+            {
                 fComplete = eANI_BOOLEAN_TRUE;
             }
             if(fComplete)
@@ -4529,7 +4535,7 @@ static eHalStatus csrRoam( tpAniSirGlobal pMac, tSmeCmd *pCommand )
                {
                    csrRoamComplete( pMac, eCsrNothingToJoin, NULL );
                }
-            }    
+            }
        }
        else if ( eCsrReassocToSelfNoCapChange == RoamState )
        {
@@ -4537,10 +4543,10 @@ static eHalStatus csrRoam( tpAniSirGlobal pMac, tSmeCmd *pCommand )
        }
        else if ( eCsrStartIbssSameIbss == RoamState )
        {
-           csrRoamComplete( pMac, eCsrSilentlyStopRoaming, NULL );        
+           csrRoamComplete( pMac, eCsrSilentlyStopRoaming, NULL );
        }
     }//hddIsRadioStateOn
-    
+
     return status;
 }
 eHalStatus csrProcessFTReassocRoamCommand ( tpAniSirGlobal pMac, tSmeCmd *pCommand )
@@ -4558,12 +4564,12 @@ eHalStatus csrProcessFTReassocRoamCommand ( tpAniSirGlobal pMac, tSmeCmd *pComma
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     if(CSR_IS_ROAMING(pSession) && pSession->fCancelRoaming)
     {
         //the roaming is cancelled. Simply complete the command
         smsLog(pMac, LOG1, FL("  Roam command cancelled"));
-        csrRoamComplete(pMac, eCsrNothingToJoin, NULL); 
+        csrRoamComplete(pMac, eCsrNothingToJoin, NULL);
         return eHAL_STATUS_FAILURE;
     }
     if (pCommand->u.roamCmd.pRoamBssEntry)
@@ -4575,10 +4581,10 @@ eHalStatus csrProcessFTReassocRoamCommand ( tpAniSirGlobal pMac, tSmeCmd *pComma
     {
         //the roaming is cancelled. Simply complete the command
         smsLog(pMac, LOG1, FL("  Roam command cancelled"));
-        csrRoamComplete(pMac, eCsrNothingToJoin, NULL); 
+        csrRoamComplete(pMac, eCsrNothingToJoin, NULL);
         return eHAL_STATUS_FAILURE;
     }
-    status = csrRoamIssueReassociate(pMac, sessionId, pBssDesc, 
+    status = csrRoamIssueReassociate(pMac, sessionId, pBssDesc,
         (tDot11fBeaconIEs *)( pScanResult->Result.pvIes ), &pCommand->u.roamCmd.roamProfile);
     return status;
 }
@@ -4595,7 +4601,7 @@ eHalStatus csrRoamProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     switch ( pCommand->u.roamCmd.roamReason )
     {
     case eCsrForcedDisassoc:
@@ -4645,9 +4651,9 @@ eHalStatus csrRoamProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
                 roamInfo.pBssDesc = pSession->pConnectBssDesc;
                 roamInfo.pProfile = &pCommand->u.roamCmd.roamProfile;
                 pSession->bRefAssocStartCnt++;
-                csrRoamCallCallback( pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, 
+                csrRoamCallCallback( pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
                                      eCSR_ROAM_ASSOCIATION_START, eCSR_ROAM_RESULT_NONE );
-   
+
                 smsLog(pMac, LOG1, FL("  calling csrRoamIssueReassociate"));
                 status = csrRoamIssueReassociate( pMac, sessionId, pSession->pConnectBssDesc, pIes,
                                                   &pCommand->u.roamCmd.roamProfile );
@@ -4666,7 +4672,7 @@ eHalStatus csrRoamProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
     case eCsrCapsChange:
         smsLog(pMac, LOGE, FL("received eCsrCapsChange "));
         csrRoamStateChange( pMac, eCSR_ROAMING_STATE_JOINING, sessionId );
-        status = csrRoamIssueDisassociate( pMac, sessionId, eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING, FALSE); 
+        status = csrRoamIssueDisassociate( pMac, sessionId, eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING, FALSE);
         break;
     case eCsrSmeIssuedFTReassoc:
         smsLog(pMac, LOG1, FL("received FT Reassoc Req "));
@@ -4681,20 +4687,20 @@ eHalStatus csrRoamProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
     case eCsrForcedDisassocSta:
        csrRoamStateChange( pMac, eCSR_ROAMING_STATE_JOINING, sessionId);
        csrRoamSubstateChange( pMac, eCSR_ROAM_SUBSTATE_DISASSOC_REQ, sessionId);
-       status = csrSendMBDisassocReqMsg( pMac, sessionId, pCommand->u.roamCmd.peerMac, 
+       status = csrSendMBDisassocReqMsg( pMac, sessionId, pCommand->u.roamCmd.peerMac,
                      pCommand->u.roamCmd.reason);
        break;
 
     case eCsrForcedDeauthSta:
        csrRoamStateChange( pMac, eCSR_ROAMING_STATE_JOINING, sessionId);
        csrRoamSubstateChange( pMac, eCSR_ROAM_SUBSTATE_DEAUTH_REQ, sessionId);
-       status = csrSendMBDeauthReqMsg( pMac, sessionId, pCommand->u.roamCmd.peerMac, 
+       status = csrSendMBDeauthReqMsg( pMac, sessionId, pCommand->u.roamCmd.peerMac,
                      pCommand->u.roamCmd.reason);
        break;
 
     case eCsrPerformPreauth:
         smsLog(pMac, LOG1, FL("Attempting FT PreAuth Req"));
-        status = csrRoamIssueFTPreauthReq(pMac, sessionId, 
+        status = csrRoamIssueFTPreauthReq(pMac, sessionId,
                 pCommand->u.roamCmd.pLastRoamBss);
         break;
 
@@ -4703,7 +4709,7 @@ eHalStatus csrRoamProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
 
         if( pCommand->u.roamCmd.fUpdateCurRoamProfile )
         {
-            //Remember the roaming profile 
+            //Remember the roaming profile
             csrFreeRoamProfile(pMac, sessionId);
             pSession->pCurRoamProfile = vos_mem_malloc(sizeof(tCsrRoamProfile));
             if ( NULL != pSession->pCurRoamProfile )
@@ -4712,10 +4718,10 @@ eHalStatus csrRoamProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
                 csrRoamCopyProfile(pMac, pSession->pCurRoamProfile, &pCommand->u.roamCmd.roamProfile);
             }
         }
- 
+
         //At this point, original uapsd_mask is saved in pCurRoamProfile
         //uapsd_mask in the pCommand may change from this point on.
- 
+
         // Attempt to roam with the new scan results (if we need to..)
         status = csrRoam( pMac, pCommand );
         if(!HAL_STATUS_SUCCESS(status))
@@ -4727,7 +4733,7 @@ eHalStatus csrRoamProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
     return (status);
 }
 
-void csrReinitPreauthCmd(tpAniSirGlobal pMac, tSmeCmd *pCommand) 
+void csrReinitPreauthCmd(tpAniSirGlobal pMac, tSmeCmd *pCommand)
 {
     pCommand->u.roamCmd.pLastRoamBss = NULL;
     pCommand->u.roamCmd.pRoamBssEntry = NULL;
@@ -4735,7 +4741,7 @@ void csrReinitPreauthCmd(tpAniSirGlobal pMac, tSmeCmd *pCommand)
     vos_mem_set(&pCommand->u.roamCmd, sizeof(tRoamCmd), 0);
 }
 
-void csrReinitRoamCmd(tpAniSirGlobal pMac, tSmeCmd *pCommand) 
+void csrReinitRoamCmd(tpAniSirGlobal pMac, tSmeCmd *pCommand)
 {
     if(pCommand->u.roamCmd.fReleaseBssList)
     {
@@ -4771,7 +4777,7 @@ void csrRoamComplete( tpAniSirGlobal pMac, eCsrRoamCompleteResult Result, void *
         // and put this on the Free queue.
         if ( eSmeCommandRoam == pCommand->command )
         {
-            //we need to process the result first before removing it from active list because state changes 
+            //we need to process the result first before removing it from active list because state changes
             //still happening insides roamQProcessRoamResults so no other roam command should be issued
             fReleaseCommand = csrRoamProcessResults( pMac, pCommand, Result, Context );
             if( fReleaseCommand )
@@ -4835,7 +4841,7 @@ void csrResetBKIDCandidateList( tpAniSirGlobal pMac, tANI_U32 sessionId )
 #endif /* FEATURE_WLAN_WAPI */
 extern tANI_U8 csrWpaOui[][ CSR_WPA_OUI_SIZE ];
 
-static eHalStatus csrRoamSaveSecurityRspIE(tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrAuthType authType, 
+static eHalStatus csrRoamSaveSecurityRspIE(tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrAuthType authType,
                                          tSirBssDescription *pSirBssDesc,
                                          tDot11fBeaconIEs *pIes)
 {
@@ -4848,7 +4854,7 @@ static eHalStatus csrRoamSaveSecurityRspIE(tpAniSirGlobal pMac, tANI_U32 session
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     if((eCSR_AUTH_TYPE_WPA == authType) ||
         (eCSR_AUTH_TYPE_WPA_PSK == authType) ||
         (eCSR_AUTH_TYPE_RSN == authType) ||
@@ -4858,7 +4864,7 @@ static eHalStatus csrRoamSaveSecurityRspIE(tpAniSirGlobal pMac, tANI_U32 session
        (eCSR_AUTH_TYPE_FT_RSN == authType) ||
        (eCSR_AUTH_TYPE_FT_RSN_PSK == authType)
 #endif /* FEATURE_WLAN_WAPI */
-#ifdef FEATURE_WLAN_WAPI 
+#ifdef FEATURE_WLAN_WAPI
       ||
        (eCSR_AUTH_TYPE_WAPI_WAI_PSK == authType) ||
        (eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE == authType)
@@ -4941,7 +4947,7 @@ static eHalStatus csrRoamSaveSecurityRspIE(tpAniSirGlobal pMac, tANI_U32 session
                         vos_mem_copy(pIeBuf,
                                      pIesLocal->RSN.akm_suites + pIesLocal->RSN.akm_suite_count * 4,
                                      2 + pIesLocal->RSN.pmkid_count * 4);
-                        pSession->nWpaRsnRspIeLength = nIeLen + 2; 
+                        pSession->nWpaRsnRspIeLength = nIeLen + 2;
                     }
                 }
             }
@@ -4978,7 +4984,7 @@ static eHalStatus csrRoamSaveSecurityRspIE(tpAniSirGlobal pMac, tANI_U32 session
                         vos_mem_copy(pIeBuf, &pIesLocal->WPA.auth_suite_count,
                                      2 + pIesLocal->WPA.auth_suite_count * 4);
                         pIeBuf += pIesLocal->WPA.auth_suite_count * 4;
-                        pSession->nWpaRsnRspIeLength = nIeLen + 2; 
+                        pSession->nWpaRsnRspIeLength = nIeLen + 2;
                     }
                 }
             }
@@ -4989,7 +4995,7 @@ static eHalStatus csrRoamSaveSecurityRspIE(tpAniSirGlobal pMac, tANI_U32 session
                 if(pIesLocal->WAPI.present)
                 {
                    //Calculate the actual length
-                   nIeLen = 4 //version + akm_suite_count 
+                   nIeLen = 4 //version + akm_suite_count
                       + pIesLocal->WAPI.akm_suite_count * 4 // akm_suites
                       + 2 //pwise_cipher_suite_count
                       + pIesLocal->WAPI.unicast_cipher_suite_count * 4    //pwise_cipher_suites
@@ -4998,7 +5004,7 @@ static eHalStatus csrRoamSaveSecurityRspIE(tpAniSirGlobal pMac, tANI_U32 session
                       {
                            nIeLen += 2 + pIesLocal->WAPI.bkid_count * 4;  //bkid
         }
-                      
+
                    //nIeLen doesn't count EID and length fields
                    pSession->pWapiRspIE = vos_mem_malloc(nIeLen + 2);
                    if ( NULL == pSession->pWapiRspIE )
@@ -5216,7 +5222,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                                        eCsrRoamCompleteResult Result, void *Context )
 {
     tANI_BOOLEAN fReleaseCommand = eANI_BOOLEAN_TRUE;
-    tSirBssDescription *pSirBssDesc = NULL;   
+    tSirBssDescription *pSirBssDesc = NULL;
     tSirMacAddr BroadcastMac = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
     tCsrScanResult *pScanResult = NULL;
     tCsrRoamInfo roamInfo;
@@ -5302,11 +5308,11 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                 {
                     vos_mem_copy(&roamInfo.bssid, &pSirBssDesc->bssId,
                                  sizeof(tCsrBssid));
-                } 
+                }
             }
             else
             {
-     
+
                 if(pCommand->u.roamCmd.pRoamBssEntry)
                 {
                     pScanResult = GET_BASE_ADDR(pCommand->u.roamCmd.pRoamBssEntry, tCsrScanResult, Link);
@@ -5329,28 +5335,28 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
 #ifdef FEATURE_WLAN_CCX
                 roamInfo.isCCXAssoc = pSession->connectedProfile.isCCXAssoc;
 #endif
-                
+
                 // csrRoamStateChange also affects sub-state. Hence, csrRoamStateChange happens first and then
                 // substate change.
                 // Moving even save profile above so that below mentioned conditon is also met.
                 // JEZ100225: Moved to after saving the profile. Fix needed in main/latest
                 csrRoamStateChange( pMac, eCSR_ROAMING_STATE_JOINED, sessionId );
-                // Make sure the Set Context is issued before link indication to NDIS.  After link indication is 
+                // Make sure the Set Context is issued before link indication to NDIS.  After link indication is
                 // made to NDIS, frames could start flowing.  If we have not set context with LIM, the frames
-                // will be dropped for the security context may not be set properly. 
+                // will be dropped for the security context may not be set properly.
                 //
                 // this was causing issues in the 2c_wlan_wep WHQL test when the SetContext was issued after the link
                 // indication.  (Link Indication happens in the profFSMSetConnectedInfra call).
                 //
                 // this reordering was done on titan_prod_usb branch and is being replicated here.
                 //
-            
+
                 if( CSR_IS_ENC_TYPE_STATIC( pProfile->negotiatedUCEncryptionType ) &&
                                         !pProfile->bWPSAssociation)
                 {
                     // Issue the set Context request to LIM to establish the Unicast STA context
                     if( !HAL_STATUS_SUCCESS( csrRoamIssueSetContextReq( pMac, sessionId,
-                                                pProfile->negotiatedUCEncryptionType, 
+                                                pProfile->negotiatedUCEncryptionType,
                                                 pSirBssDesc, &(pSirBssDesc->bssId),
                                                 FALSE, TRUE, eSIR_TX_RX, 0, 0, NULL, 0 ) ) ) // NO keys... these key parameters don't matter.
                     {
@@ -5377,7 +5383,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                     {
                         key_timeout_interval = CSR_WAIT_FOR_KEY_TIMEOUT_PERIOD;
                     }
-                    
+
                     //Save sessionId in case of timeout
                     pMac->roam.WaitForKeyTimerInfo.sessionId = (tANI_U8)sessionId;
                     //This time should be long enough for the rest of the process plus setting key
@@ -5388,7 +5394,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                         csrRoamSubstateChange( pMac, eCSR_ROAM_SUBSTATE_NONE, sessionId);
                     }
                 }
-                
+
                 assocInfo.pBssDesc = pSirBssDesc; //could be NULL
                 assocInfo.pProfile = pProfile;
                 if(Context)
@@ -5399,7 +5405,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                     len = pJoinRsp->assocReqLength + pJoinRsp->assocRspLength + pJoinRsp->beaconLength;
 #ifdef WLAN_FEATURE_VOWIFI_11R
                     len += pJoinRsp->parsedRicRspLen;
-#endif /* WLAN_FEATURE_VOWIFI_11R */                    
+#endif /* WLAN_FEATURE_VOWIFI_11R */
 #ifdef FEATURE_WLAN_CCX
                     len += pJoinRsp->tspecIeLen;
 #endif
@@ -5415,7 +5421,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                             pSession->connectedInfo.nBeaconLength = pJoinRsp->beaconLength;
 #ifdef WLAN_FEATURE_VOWIFI_11R
                             pSession->connectedInfo.nRICRspLength = pJoinRsp->parsedRicRspLen;
-#endif /* WLAN_FEATURE_VOWIFI_11R */                                
+#endif /* WLAN_FEATURE_VOWIFI_11R */
 #ifdef FEATURE_WLAN_CCX
                             pSession->connectedInfo.nTspecIeLength = pJoinRsp->tspecIeLen;
 #endif
@@ -5447,8 +5453,8 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                    }
                 }
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
-                // Indicate SME-QOS with reassoc success event, only after 
-                // copying the frames 
+                // Indicate SME-QOS with reassoc success event, only after
+                // copying the frames
                 sme_QosCsrEventInd(pMac, (v_U8_t)sessionId, ind_qos, &assocInfo);
 #endif
                 roamInfo.pBssDesc = pSirBssDesc;
@@ -5479,7 +5485,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                 if( pSession->bRefAssocStartCnt > 0 )
                 {
                     pSession->bRefAssocStartCnt--;
-                    //Remove this code once SLM_Sessionization is supported 
+                    //Remove this code once SLM_Sessionization is supported
                     //BMPS_WORKAROUND_NOT_NEEDED
                     if(!IS_FEATURE_SUPPORTED_BY_FW(SLM_SESSIONIZATION) && ( csrIsConcurrentSessionRunning( pMac )))
                     {
@@ -5487,14 +5493,14 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                     }
                     csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, eCSR_ROAM_ASSOCIATION_COMPLETION, eCSR_ROAM_RESULT_ASSOCIATED);
                 }
-                
+
                 csrRoamCompletion(pMac, sessionId, NULL, pCommand, eCSR_ROAM_RESULT_NONE, eANI_BOOLEAN_TRUE);
                 // reset the PMKID candidate list
                 csrResetPMKIDCandidateList( pMac, sessionId );
                 //Update TL's AC weight base on the current EDCA parameters
                 //These parameters may change in the course of the connection, that sictuation
                 //is not taken care here. This change is mainly to address a WIFI WMM test where
-                //BE has a equal or higher TX priority than VI. 
+                //BE has a equal or higher TX priority than VI.
                 //We only do this for infra link
                 if( csrIsConnStateConnectedInfra(pMac, sessionId ) && pIes )
                 {
@@ -5561,7 +5567,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                     smsLog(pMac, LOG2, FL("cannot parse IBSS IEs"));
                     roamInfo.pBssDesc = pSirBssDesc;
                     //We need to associate_complete it first, becasue Associate_start already indicated.
-                    csrRoamCallCallback( pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, 
+                    csrRoamCallCallback( pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
                             eCSR_ROAM_IBSS_IND, eCSR_ROAM_RESULT_IBSS_START_FAILED );
                     break;
                 }
@@ -5584,10 +5590,10 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                 {
                     vos_log_ibss_pkt_type *pIbssLog;
                     tANI_U32 bi;
-    
+
                     WLAN_VOS_DIAG_LOG_ALLOC(pIbssLog, vos_log_ibss_pkt_type, LOG_WLAN_IBSS_C);
                     if(pIbssLog)
-                    { 
+                    {
                         if(CSR_INVALID_SCANRESULT_HANDLE == pCommand->u.roamCmd.hBSSList)
                         {
                             //We start the IBSS (didn't find any matched IBSS out there)
@@ -5623,7 +5629,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
 #endif
                     {
                         csrRoamIssueSetContextReq( pMac, sessionId,
-                                        pProfile->negotiatedMCEncryptionType, 
+                                        pProfile->negotiatedMCEncryptionType,
                                         pSirBssDesc, &BroadcastMac,
                                         FALSE, FALSE, eSIR_TX_RX, 0, 0, NULL, 0 ); // NO keys... these key parameters don't matter.
                     }
@@ -5652,7 +5658,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                 }
             }
             //Only tell upper layer is we start the BSS because Vista doesn't like multiple connection
-            //indications. If we don't start the BSS ourself, handler of eSIR_SME_JOINED_NEW_BSS will 
+            //indications. If we don't start the BSS ourself, handler of eSIR_SME_JOINED_NEW_BSS will
             //trigger the connection start indication in Vista
             if( !CSR_IS_JOIN_TO_IBSS( pProfile ) )
             {
@@ -5668,9 +5674,9 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                     roamStatus = eCSR_ROAM_INFRA_IND;
                     roamResult = eCSR_ROAM_RESULT_INFRA_STARTED;
                 }
-                 
+
                 //Only tell upper layer is we start the BSS because Vista doesn't like multiple connection
-                //indications. If we don't start the BSS ourself, handler of eSIR_SME_JOINED_NEW_BSS will 
+                //indications. If we don't start the BSS ourself, handler of eSIR_SME_JOINED_NEW_BSS will
                 //trigger the connection start indication in Vista
                 vos_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0);
                 roamInfo.statusCode = pSession->joinFailStatusCode.statusCode;
@@ -5680,7 +5686,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                 roamInfo.staId = (tANI_U8)pSmeStartBssRsp->staId;
                 vos_mem_copy(roamInfo.bssid, pSirBssDesc->bssId,
                              sizeof(tCsrBssid));
-                 //Remove this code once SLM_Sessionization is supported 
+                 //Remove this code once SLM_Sessionization is supported
                  //BMPS_WORKAROUND_NOT_NEEDED
                 if(!IS_FEATURE_SUPPORTED_BY_FW(SLM_SESSIONIZATION) &&
                    ( csrIsConcurrentSessionRunning( pMac )))
@@ -5690,14 +5696,14 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
 
                 csrRoamCallCallback( pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, roamStatus, roamResult );
             }
-    
+
             csrScanCancelIdleScan(pMac);
 
             if( CSR_IS_WDS_STA( pProfile ) )
             {
                 //need to send stop BSS because we fail to send join_req
                 csrRoamIssueDisassociateCmd( pMac, sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED );
-                csrRoamCallCallback( pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, 
+                csrRoamCallCallback( pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
                                         eCSR_ROAM_WDS_IND, eCSR_ROAM_RESULT_WDS_STOPPED );
             }
             break;
@@ -5755,7 +5761,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
             }
             //Since there is no change in the current state, simply pass back no result otherwise
             //HDD may be mistakenly mark to disconnected state.
-            csrRoamCallCallback( pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, 
+            csrRoamCallCallback( pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
                                         eCSR_ROAM_IBSS_IND, eCSR_ROAM_RESULT_NONE );
             break;
         case eCsrSilentlyStopRoamingSaveState:
@@ -5763,7 +5769,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
             //No message to PE
             smsLog(pMac, LOGW, FL("receives silently stop roaming indication"));
             vos_mem_set(&roamInfo, sizeof(roamInfo), 0);
-            
+
             //to aviod resetting the substate to NONE
             pMac->roam.curState[sessionId] = eCSR_ROAMING_STATE_JOINED;
             //No need to change substate to wai_for_key because there is no state change
@@ -5787,7 +5793,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                return eANI_BOOLEAN_FALSE;
             }
             pSession->bRefAssocStartCnt--;
-            csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, 
+            csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
                                         eCSR_ROAM_ASSOCIATION_COMPLETION, eCSR_ROAM_RESULT_ASSOCIATED);
             csrRoamCompletion(pMac, sessionId, NULL, pCommand, eCSR_ROAM_RESULT_ASSOCIATED, eANI_BOOLEAN_TRUE);
             break;
@@ -5804,8 +5810,8 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
             roamInfo.pBssDesc = pCommand->u.roamCmd.pLastRoamBss;
             roamInfo.statusCode = pSession->joinFailStatusCode.statusCode;
             roamInfo.reasonCode = pSession->joinFailStatusCode.reasonCode;
-            csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, 
-                                    eCSR_ROAM_WDS_IND, 
+            csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
+                                    eCSR_ROAM_WDS_IND,
                                     eCSR_ROAM_RESULT_WDS_NOT_ASSOCIATED);
             //Need to issue stop_bss
             break;
@@ -5817,7 +5823,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
             smsLog(pMac, LOGW, FL("receives no association indication"));
             smsLog(pMac, LOG1, FL("Assoc ref count %d"),
                    pSession->bRefAssocStartCnt);
-            if( CSR_IS_INFRASTRUCTURE( &pSession->connectedProfile ) || 
+            if( CSR_IS_INFRASTRUCTURE( &pSession->connectedProfile ) ||
                 CSR_IS_ROAM_SUBSTATE_STOP_BSS_REQ( pMac, sessionId ) )
             {
                 //do not free for the other profiles as we need to send down stop BSS later
@@ -5859,14 +5865,14 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                             pSession->bRefAssocStartCnt--;
                             if(eCsrJoinFailureDueToConcurrency == Result)
                             {
-                                csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, 
-                                                eCSR_ROAM_ASSOCIATION_COMPLETION, 
+                                csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
+                                                eCSR_ROAM_ASSOCIATION_COMPLETION,
                                                 eCSR_ROAM_RESULT_ASSOC_FAIL_CON_CHANNEL);
                             }
                             else
                             {
-                                csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, 
-                                                eCSR_ROAM_ASSOCIATION_COMPLETION, 
+                                csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
+                                                eCSR_ROAM_ASSOCIATION_COMPLETION,
                                                 eCSR_ROAM_RESULT_FAILURE);
                             }
                         }
@@ -5902,7 +5908,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                     csrRoamStateChange( pMac, eCSR_ROAMING_STATE_IDLE, sessionId);
 
                     csrRoamCallCallback(pMac, sessionId, NULL, pCommand->u.roamCmd.roamId, eCSR_ROAM_DISASSOCIATED, eCSR_ROAM_RESULT_FORCED);
-#ifndef WLAN_MDM_CODE_REDUCTION_OPT                                        
+#ifndef WLAN_MDM_CODE_REDUCTION_OPT
                     sme_QosCsrEventInd(pMac, (tANI_U8)sessionId, SME_QOS_CSR_DISCONNECT_IND, NULL);
 #endif
                     csrRoamCompletion(pMac, sessionId, NULL, pCommand, eCSR_ROAM_RESULT_FAILURE, eANI_BOOLEAN_FALSE);
@@ -5920,8 +5926,8 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                     }
                     else
                     {
-                        csrRoamCallCallback(pMac, sessionId, NULL, 
-                                            pCommand->u.roamCmd.roamId, 
+                        csrRoamCallCallback(pMac, sessionId, NULL,
+                                            pCommand->u.roamCmd.roamId,
                                             eCSR_ROAM_DISASSOCIATED, eCSR_ROAM_RESULT_FORCED);
                     }
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
@@ -5931,8 +5937,8 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                     csrScanStartIdleScan(pMac);
                     break;
                 case eCsrForcedIbssLeave:
-                     csrRoamCallCallback(pMac, sessionId, NULL, 
-                                        pCommand->u.roamCmd.roamId, 
+                     csrRoamCallCallback(pMac, sessionId, NULL,
+                                        pCommand->u.roamCmd.roamId,
                                         eCSR_ROAM_IBSS_LEAVE,
                                         eCSR_ROAM_RESULT_IBSS_STOP);
                     break;
@@ -5946,16 +5952,16 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                     csrScanStartIdleScan(pMac);
                     break;
                 case eCsrStopBss:
-                    csrRoamCallCallback(pMac, sessionId, NULL, 
-                                        pCommand->u.roamCmd.roamId, 
-                                        eCSR_ROAM_INFRA_IND, 
+                    csrRoamCallCallback(pMac, sessionId, NULL,
+                                        pCommand->u.roamCmd.roamId,
+                                        eCSR_ROAM_INFRA_IND,
                                         eCSR_ROAM_RESULT_INFRA_STOPPED);
                     break;
                 case eCsrForcedDisassocSta:
                 case eCsrForcedDeauthSta:
                    csrRoamStateChange( pMac, eCSR_ROAMING_STATE_JOINED, sessionId);
                    if( CSR_IS_SESSION_VALID(pMac, sessionId) )
-                   {                    
+                   {
                        pSession = CSR_GET_SESSION(pMac, sessionId);
 
                        if ( CSR_IS_INFRA_AP(&pSession->connectedProfile) )
@@ -5966,8 +5972,8 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                                         sizeof(tSirMacAddr));
                            roamInfo.reasonCode = eCSR_ROAM_RESULT_FORCED;
                            roamInfo.statusCode = eSIR_SME_SUCCESS;
-                           status = csrRoamCallCallback(pMac, sessionId, 
-                                       &roamInfo, pCommand->u.roamCmd.roamId, 
+                           status = csrRoamCallCallback(pMac, sessionId,
+                                       &roamInfo, pCommand->u.roamCmd.roamId,
                                        eCSR_ROAM_LOSTLINK, eCSR_ROAM_RESULT_FORCED);
                        }
                    }
@@ -6004,7 +6010,7 @@ eHalStatus csrRoamCopyProfile(tpAniSirGlobal pMac, tCsrRoamProfile *pDstProfile,
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tANI_U32 size = 0;
-    
+
     do
     {
         vos_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0);
@@ -6152,7 +6158,7 @@ eHalStatus csrRoamCopyProfile(tpAniSirGlobal pMac, tCsrRoamProfile *pDstProfile,
         pDstProfile->BSSType = pSrcProfile->BSSType;
         pDstProfile->phyMode = pSrcProfile->phyMode;
         pDstProfile->csrPersona = pSrcProfile->csrPersona;
-        
+
 #ifdef FEATURE_WLAN_WAPI
         if(csrIsProfileWapi(pSrcProfile))
         {
@@ -6171,10 +6177,10 @@ eHalStatus csrRoamCopyProfile(tpAniSirGlobal pMac, tCsrRoamProfile *pDstProfile,
         pDstProfile->fwdWPSPBCProbeReq = pSrcProfile->fwdWPSPBCProbeReq;
         pDstProfile->csr80211AuthType  = pSrcProfile->csr80211AuthType;
         pDstProfile->dtimPeriod        = pSrcProfile->dtimPeriod;
-        pDstProfile->ApUapsdEnable     = pSrcProfile->ApUapsdEnable;   
+        pDstProfile->ApUapsdEnable     = pSrcProfile->ApUapsdEnable;
         pDstProfile->SSIDs.SSIDList[0].ssidHidden = pSrcProfile->SSIDs.SSIDList[0].ssidHidden;
-        pDstProfile->protEnabled       = pSrcProfile->protEnabled;  
-        pDstProfile->obssProtEnabled   = pSrcProfile->obssProtEnabled;  
+        pDstProfile->protEnabled       = pSrcProfile->protEnabled;
+        pDstProfile->obssProtEnabled   = pSrcProfile->obssProtEnabled;
         pDstProfile->cfg_protection    = pSrcProfile->cfg_protection;
         pDstProfile->wps_state         = pSrcProfile->wps_state;
         pDstProfile->ieee80211d        = pSrcProfile->ieee80211d;
@@ -6188,19 +6194,19 @@ eHalStatus csrRoamCopyProfile(tpAniSirGlobal pMac, tCsrRoamProfile *pDstProfile,
         }
 #endif
     }while(0);
-    
+
     if(!HAL_STATUS_SUCCESS(status))
     {
         csrReleaseProfile(pMac, pDstProfile);
         pDstProfile = NULL;
     }
-    
+
     return (status);
 }
 eHalStatus csrRoamCopyConnectedProfile(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pDstProfile )
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
-    tCsrRoamConnectedProfile *pSrcProfile = &pMac->roam.roamSession[sessionId].connectedProfile; 
+    tCsrRoamConnectedProfile *pSrcProfile = &pMac->roam.roamSession[sessionId].connectedProfile;
     do
     {
         vos_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0);
@@ -6284,26 +6290,26 @@ eHalStatus csrRoamCopyConnectedProfile(tpAniSirGlobal pMac, tANI_U32 sessionId,
             pDstProfile->MDID.mobilityDomain = pSrcProfile->MDID.mobilityDomain;
         }
 #endif
-    
+
     }while(0);
-    
+
     if(!HAL_STATUS_SUCCESS(status))
     {
         csrReleaseProfile(pMac, pDstProfile);
         pDstProfile = NULL;
     }
-    
+
     return (status);
 }
 
-eHalStatus csrRoamIssueConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
-                                tScanResultHandle hBSSList, 
+eHalStatus csrRoamIssueConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
+                                tScanResultHandle hBSSList,
                                 eCsrRoamReason reason, tANI_U32 roamId, tANI_BOOLEAN fImediate,
                                 tANI_BOOLEAN fClearScan)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tSmeCmd *pCommand;
-    
+
     pCommand = csrGetCommandBuffer(pMac);
     if(NULL == pCommand)
     {
@@ -6323,11 +6329,11 @@ eHalStatus csrRoamIssueConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoam
             //We can roam now
             //Since pProfile is NULL, we need to build our own profile, set everything to default
             //We can only support open and no encryption
-            pCommand->u.roamCmd.roamProfile.AuthType.numEntries = 1; 
+            pCommand->u.roamCmd.roamProfile.AuthType.numEntries = 1;
             pCommand->u.roamCmd.roamProfile.AuthType.authType[0] = eCSR_AUTH_TYPE_OPEN_SYSTEM;
             pCommand->u.roamCmd.roamProfile.EncryptionType.numEntries = 1;
             pCommand->u.roamCmd.roamProfile.EncryptionType.encryptionType[0] = eCSR_ENCRYPT_TYPE_NONE;
-            pCommand->u.roamCmd.roamProfile.csrPersona = VOS_STA_MODE; 
+            pCommand->u.roamCmd.roamProfile.csrPersona = VOS_STA_MODE;
         }
         else
         {
@@ -6357,7 +6363,7 @@ eHalStatus csrRoamIssueConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoam
             csrReleaseCommandRoam( pMac, pCommand );
         }
     }
-    
+
     return (status);
 }
 eHalStatus csrRoamIssueReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
@@ -6366,7 +6372,7 @@ eHalStatus csrRoamIssueReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoam
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tSmeCmd *pCommand;
-    
+
     pCommand = csrGetCommandBuffer(pMac);
     if(NULL == pCommand)
     {
@@ -6401,7 +6407,7 @@ eHalStatus csrRoamIssueReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoam
         pCommand->u.roamCmd.roamReason = reason;
         //We need to free the BssList when the command is done
         //For reassoc there is no BSS list, so the boolean set to false
-        pCommand->u.roamCmd.hBSSList = CSR_INVALID_SCANRESULT_HANDLE; 
+        pCommand->u.roamCmd.hBSSList = CSR_INVALID_SCANRESULT_HANDLE;
         pCommand->u.roamCmd.fReleaseBssList = eANI_BOOLEAN_FALSE;
         pCommand->u.roamCmd.fReassoc = eANI_BOOLEAN_TRUE;
         status = csrQueueSmeCommand(pMac, pCommand, fImediate);
@@ -6421,7 +6427,7 @@ eHalStatus csrRoamEnqueuePreauth(tpAniSirGlobal pMac, tANI_U32 sessionId, tpSirB
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tSmeCmd *pCommand;
-    
+
     pCommand = csrGetCommandBuffer(pMac);
     if(NULL == pCommand)
     {
@@ -6437,7 +6443,7 @@ eHalStatus csrRoamEnqueuePreauth(tpAniSirGlobal pMac, tANI_U32 sessionId, tpSirB
             pCommand->sessionId = (tANI_U8)sessionId;
             pCommand->u.roamCmd.roamReason = reason;
             //this is the important parameter
-            //in this case we are using this field for the "next" BSS 
+            //in this case we are using this field for the "next" BSS
             pCommand->u.roamCmd.pLastRoamBss = pBssDescription;
             status = csrQueueSmeCommand(pMac, pCommand, fImmediate);
             if( !HAL_STATUS_SUCCESS( status ) )
@@ -6463,9 +6469,9 @@ eHalStatus csrRoamDequeuePreauth(tpAniSirGlobal pMac)
     if ( pEntry )
     {
         pCommand = GET_BASE_ADDR( pEntry, tSmeCmd, Link );
-        if ( (eSmeCommandRoam == pCommand->command) && 
+        if ( (eSmeCommandRoam == pCommand->command) &&
                 (eCsrPerformPreauth == pCommand->u.roamCmd.roamReason))
-        {             
+        {
             smsLog( pMac, LOG1, FL("DQ-Command = %d, Reason = %d"),
                     pCommand->command, pCommand->u.roamCmd.roamReason);
             if (csrLLRemoveEntry( &pMac->sme.smeCmdActiveList, pEntry, LL_ACCESS_LOCK )) {
@@ -6483,7 +6489,7 @@ eHalStatus csrRoamDequeuePreauth(tpAniSirGlobal pMac)
     return eHAL_STATUS_SUCCESS;
 }
 
-eHalStatus csrRoamConnectWithBSSList(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+eHalStatus csrRoamConnectWithBSSList(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                                      tScanResultHandle hBssListIn, tANI_U32 *pRoamId)
 {
     eHalStatus status = eHAL_STATUS_FAILURE;
@@ -6497,7 +6503,7 @@ eHalStatus csrRoamConnectWithBSSList(tpAniSirGlobal pMac, tANI_U32 sessionId, tC
         {
             *pRoamId = roamId;
         }
-        status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued, 
+        status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued,
                                         roamId, eANI_BOOLEAN_FALSE, eANI_BOOLEAN_FALSE);
         if(!HAL_STATUS_SUCCESS(status))
         {
@@ -6508,7 +6514,7 @@ eHalStatus csrRoamConnectWithBSSList(tpAniSirGlobal pMac, tANI_U32 sessionId, tC
     return (status);
 }
 
-eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                           tScanResultHandle hBssListIn, tANI_U32 *pRoamId)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -6524,7 +6530,7 @@ eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
     }
     smsLog(pMac, LOG1, FL("called  BSSType = %d authtype = %d  encryType = %d"),
                 pProfile->BSSType, pProfile->AuthType.authType[0], pProfile->EncryptionType.encryptionType[0]);
-    if( CSR_IS_WDS( pProfile ) && 
+    if( CSR_IS_WDS( pProfile ) &&
         !HAL_STATUS_SUCCESS( status = csrIsBTAMPAllowed( pMac, pProfile->operationChannel ) ) )
     {
         smsLog(pMac, LOGE, FL("Request for BT AMP connection failed, channel requested is different than infra = %d"),
@@ -6550,7 +6556,7 @@ eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
         }
     }
 #ifdef FEATURE_WLAN_BTAMP_UT_RF
-    pSession->maxRetryCount = CSR_JOIN_MAX_RETRY_COUNT; 
+    pSession->maxRetryCount = CSR_JOIN_MAX_RETRY_COUNT;
 #endif
     if(CSR_INVALID_SCANRESULT_HANDLE != hBssListIn)
     {
@@ -6582,7 +6588,7 @@ eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
                 pScanFilter->EncryptionType.numEntries = 1;
                 pScanFilter->EncryptionType.encryptionType[0] = eCSR_ENCRYPT_TYPE_NONE;
             }//we don't have a profile
-            else 
+            else
             {
                 //Here is the profile we need to connect to
                 status = csrRoamPrepareFilterFromProfile(pMac, pProfile, pScanFilter);
@@ -6592,7 +6598,7 @@ eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
             {
                 *pRoamId = roamId;
             }
-            
+
             if(HAL_STATUS_SUCCESS(status))
             {
                 /*Save the WPS info*/
@@ -6611,7 +6617,7 @@ eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
                     )
                     {
                         //This can be started right away
-                        status = csrRoamIssueConnect(pMac, sessionId, pProfile, NULL, eCsrHddIssued, 
+                        status = csrRoamIssueConnect(pMac, sessionId, pProfile, NULL, eCsrHddIssued,
                                                     roamId, eANI_BOOLEAN_FALSE, eANI_BOOLEAN_FALSE);
                         if(!HAL_STATUS_SUCCESS(status))
                         {
@@ -6628,7 +6634,7 @@ eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
                     smsLog(pMac, LOG1, "************ csrScanGetResult Status ********* %d", status);
                     if(HAL_STATUS_SUCCESS(status))
                     {
-                        status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued, 
+                        status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued,
                                                     roamId, eANI_BOOLEAN_FALSE, eANI_BOOLEAN_FALSE);
                         if(!HAL_STATUS_SUCCESS(status))
                         {
@@ -6642,7 +6648,7 @@ eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
                         //Check whether it is for start ibss
                         if(CSR_IS_START_IBSS(pProfile))
                         {
-                            status = csrRoamIssueConnect(pMac, sessionId, pProfile, NULL, eCsrHddIssued, 
+                            status = csrRoamIssueConnect(pMac, sessionId, pProfile, NULL, eCsrHddIssued,
                                                         roamId, eANI_BOOLEAN_FALSE, eANI_BOOLEAN_FALSE);
                             if(!HAL_STATUS_SUCCESS(status))
                             {
@@ -6676,7 +6682,7 @@ eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
                     csrFreeScanFilter(pMac, pScanFilter);
                 }
             }//Got the scan filter from profile
-            
+
             vos_mem_free(pScanFilter);
         }//allocated memory for pScanFilter
     }//No Bsslist coming in
@@ -6685,9 +6691,9 @@ eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
     {
         csrRoamCallCallback(pMac, sessionId, NULL, roamId, eCSR_ROAM_FAILED, eCSR_ROAM_RESULT_FAILURE);
     }
-   
+
     return (status);
-}                         
+}
 eHalStatus csrRoamReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                           tCsrRoamModifyProfileFields modProfileFields,
                           tANI_U32 *pRoamId)
@@ -6711,7 +6717,7 @@ eHalStatus csrRoamReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
    {
       if(pProfile)
       {
-         if(pProfile->SSIDs.numOfSSIDs && 
+         if(pProfile->SSIDs.numOfSSIDs &&
             csrIsSsidInList(pMac, &pSession->connectedProfile.SSID, &pProfile->SSIDs))
          {
             fCallCallback = eANI_BOOLEAN_FALSE;
@@ -6745,12 +6751,12 @@ eHalStatus csrRoamReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
          *pRoamId = roamId;
       }
 
-      status = csrRoamIssueReassoc(pMac, sessionId, pProfile, &modProfileFields, 
+      status = csrRoamIssueReassoc(pMac, sessionId, pProfile, &modProfileFields,
                                    eCsrHddIssuedReassocToSameAP, roamId, eANI_BOOLEAN_FALSE);
    }
    else
    {
-      status = csrRoamCallCallback(pMac, sessionId, NULL, roamId, 
+      status = csrRoamCallCallback(pMac, sessionId, NULL, roamId,
                                    eCSR_ROAM_FAILED, eCSR_ROAM_RESULT_FAILURE);
    }
    return status;
@@ -6769,7 +6775,7 @@ eHalStatus csrRoamJoinLastProfile(tpAniSirGlobal pMac, tANI_U32 sessionId)
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     do
     {
         if(pSession->pCurRoamProfile)
@@ -6810,7 +6816,7 @@ eHalStatus csrRoamJoinLastProfile(tpAniSirGlobal pMac, tANI_U32 sessionId)
             {
                 //we want to put the last connected BSS to the very beginning, if possible
                 csrMoveBssToHeadFromBSSID(pMac, &pSession->connectedProfile.bssid, hBSSList);
-                status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued, 
+                status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued,
                                                 roamId, eANI_BOOLEAN_FALSE, eANI_BOOLEAN_FALSE);
                 if(!HAL_STATUS_SUCCESS(status))
                 {
@@ -6880,7 +6886,7 @@ eHalStatus csrRoamProcessDisassocDeauth( tpAniSirGlobal pMac, tSmeCmd *pCommand,
     tANI_BOOLEAN fComplete = eANI_BOOLEAN_FALSE;
     eCsrRoamSubState NewSubstate;
     tANI_U32 sessionId = pCommand->sessionId;
-    
+
     // change state to 'Roaming'...
     csrRoamStateChange( pMac, eCSR_ROAMING_STATE_JOINING, sessionId );
 
@@ -6894,7 +6900,7 @@ eHalStatus csrRoamProcessDisassocDeauth( tpAniSirGlobal pMac, tSmeCmd *pCommand,
     {
         smsLog(pMac, LOG1, FL(" restore AC weights (%d-%d-%d-%d)"), pMac->roam.ucACWeights[0], pMac->roam.ucACWeights[1],
             pMac->roam.ucACWeights[2], pMac->roam.ucACWeights[3]);
-        //Restore AC weight in case we change it 
+        //Restore AC weight in case we change it
         WLANTL_SetACWeights(pMac->roam.gVosContext, pMac->roam.ucACWeights);
         // in Infrasturcture, we need to disassociate from the Infrastructure network...
         NewSubstate = eCSR_ROAM_SUBSTATE_DISASSOC_FORCED;
@@ -6922,11 +6928,11 @@ eHalStatus csrRoamProcessDisassocDeauth( tpAniSirGlobal pMac, tSmeCmd *pCommand,
         //This has to be WDS station
         else  if( csrIsConnStateConnectedWds( pMac, sessionId ) ) //This has to be WDS station
         {
- 
+
             pCommand->u.roamCmd.fStopWds = eANI_BOOLEAN_TRUE;
             if( fDisassoc )
             {
-                status = csrRoamIssueDisassociate( pMac, sessionId, 
+                status = csrRoamIssueDisassociate( pMac, sessionId,
                                 eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING, fMICFailure );
                 fComplete = (!HAL_STATUS_SUCCESS(status));
             }
@@ -6946,7 +6952,7 @@ eHalStatus csrRoamProcessDisassocDeauth( tpAniSirGlobal pMac, tSmeCmd *pCommand,
     {
         if ( csrIsConnStateInfra( pMac, sessionId ) )
         {
-            //Set the state to disconnect here 
+            //Set the state to disconnect here
             pMac->roam.roamSession[sessionId].connectState = eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED;
         }
     }
@@ -6978,7 +6984,7 @@ eHalStatus csrRoamIssueDisassociateCmd( tpAniSirGlobal pMac, tANI_U32 sessionId,
     {
         smsLog( pMac, LOG1, FL("  reason = %d"), reason );
         pCommand = csrGetCommandBuffer( pMac );
-        if ( !pCommand ) 
+        if ( !pCommand )
         {
             smsLog( pMac, LOGE, FL(" fail to get command buffer") );
             status = eHAL_STATUS_RESOURCES;
@@ -7032,7 +7038,7 @@ eHalStatus csrRoamIssueStopBssCmd( tpAniSirGlobal pMac, tANI_U32 sessionId, tANI
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tSmeCmd *pCommand;
     pCommand = csrGetCommandBuffer( pMac );
-    if ( NULL != pCommand ) 
+    if ( NULL != pCommand )
     {
         //Change the substate in case it is wait-for-key
         if( CSR_IS_WAIT_FOR_KEY( pMac, sessionId) )
@@ -7068,7 +7074,7 @@ eHalStatus csrRoamDisconnectInternal(tpAniSirGlobal pMac, tANI_U32 sessionId, eC
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
 #ifdef FEATURE_WLAN_BTAMP_UT_RF
     //Stop te retry
     pSession->maxRetryCount = 0;
@@ -7076,10 +7082,10 @@ eHalStatus csrRoamDisconnectInternal(tpAniSirGlobal pMac, tANI_U32 sessionId, eC
 #endif
     //Not to call cancel roaming here
     //Only issue disconnect when necessary
-    if(csrIsConnStateConnected(pMac, sessionId) || csrIsBssTypeIBSS(pSession->connectedProfile.BSSType) 
-                || csrIsBssTypeWDS(pSession->connectedProfile.BSSType) 
+    if(csrIsConnStateConnected(pMac, sessionId) || csrIsBssTypeIBSS(pSession->connectedProfile.BSSType)
+                || csrIsBssTypeWDS(pSession->connectedProfile.BSSType)
                 || csrIsRoamCommandWaitingForSession(pMac, sessionId) )
-                
+
     {
         smsLog(pMac, LOG2, FL("called"));
         status = csrRoamIssueDisassociateCmd(pMac, sessionId, reason);
@@ -7096,14 +7102,14 @@ eHalStatus csrRoamDisconnect(tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamDi
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     csrRoamCancelRoaming(pMac, sessionId);
     csrRoamRemoveDuplicateCommand(pMac, sessionId, NULL, eCsrForcedDisassoc);
-    
+
     return (csrRoamDisconnectInternal(pMac, sessionId, reason));
 }
 
-eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                                           tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -7153,7 +7159,7 @@ eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionI
         vos_mem_copy(pConnectProfile->pAddIEAssoc, pProfile->pAddIEAssoc,
                      pProfile->nAddIEAssocLength);
     }
-    
+
     //Save bssid
     csrGetBssIdBssDesc(pMac, pSirBssDesc, &pConnectProfile->bssid);
 #ifdef WLAN_FEATURE_VOWIFI_11R
@@ -7168,12 +7174,12 @@ eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionI
         status = csrGetParsedBssDescriptionIEs(pMac, pSirBssDesc, &pIesTemp);
     }
 #ifdef FEATURE_WLAN_CCX
-    if ((csrIsProfileCCX(pProfile) || 
-         ((pIesTemp->CCXVersion.present) 
-          && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM) 
-              || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA) 
-              || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK) 
-              || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN) 
+    if ((csrIsProfileCCX(pProfile) ||
+         ((pIesTemp->CCXVersion.present)
+          && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM)
+              || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA)
+              || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK)
+              || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN)
 #ifdef WLAN_FEATURE_11W
               || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK_SHA256)
 #endif
@@ -7192,10 +7198,10 @@ eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionI
             vos_mem_copy(pConnectProfile->SSID.ssId, pIesTemp->SSID.ssid,
                          pIesTemp->SSID.num_ssid);
         }
-        
+
         //Save the bss desc
         status = csrRoamSaveConnectedBssDesc(pMac, sessionId, pSirBssDesc);
-           
+
         if( CSR_IS_QOS_BSS(pIesTemp) || pIesTemp->HTCaps.present)
         {
            //Some HT AP's dont send WMM IE so in that case we assume all HT Ap's are Qos Enabled AP's
@@ -7219,7 +7225,7 @@ eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionI
     }
     //Save Qos connection
     pConnectProfile->qosConnection = pMac->roam.roamSession[sessionId].fWMMConnection;
-    
+
     if(!HAL_STATUS_SUCCESS(status))
     {
         csrFreeConnectBssDesc(pMac, sessionId);
@@ -7236,7 +7242,7 @@ eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionI
        }
        pConnectProfile->handoffPermitted = FALSE;
     }
-    
+
     return (status);
 }
 
@@ -7250,7 +7256,7 @@ static void csrRoamJoinRspProcessor( tpAniSirGlobal pMac, tSirSmeJoinRsp *pSmeJo
    {
        pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link);
    }
-   if ( eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode ) 
+   if ( eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode )
    {
             if(pCommand && eCsrSmeIssuedAssocToSimilarAP == pCommand->u.roamCmd.roamReason)
             {
@@ -7269,8 +7275,8 @@ static void csrRoamJoinRspProcessor( tpAniSirGlobal pMac, tSirSmeJoinRsp *pSmeJo
             smsLog(pMac, LOGE, FL("  session %d not found "), pSmeJoinRsp->sessionId);
             return;
         }
-        
-        
+
+
         //The head of the active list is the request we sent
         //Try to get back the same profile and roam again
         if(pCommand)
@@ -7304,8 +7310,8 @@ static void csrRoamJoinRspProcessor( tpAniSirGlobal pMac, tSirSmeJoinRsp *pSmeJo
             else
             {
                 csrRoam(pMac, pCommand);
-            }    
-        }    
+            }
+        }
         else
         {
            csrRoamComplete( pMac, eCsrNothingToJoin, NULL );
@@ -7313,14 +7319,14 @@ static void csrRoamJoinRspProcessor( tpAniSirGlobal pMac, tSirSmeJoinRsp *pSmeJo
     } /*else: ( eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode ) */
 }
 
-eHalStatus csrRoamIssueJoin( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDescription *pSirBssDesc, 
+eHalStatus csrRoamIssueJoin( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDescription *pSirBssDesc,
                              tDot11fBeaconIEs *pIes,
                              tCsrRoamProfile *pProfile, tANI_U32 roamId )
 {
     eHalStatus status;
     smsLog( pMac, LOG1, "Attempting to Join Bssid= "MAC_ADDRESS_STR,
                   MAC_ADDR_ARRAY(pSirBssDesc->bssId));
-    
+
     // Set the roaming substate to 'join attempt'...
     csrRoamSubstateChange( pMac, eCSR_ROAM_SUBSTATE_JOIN_REQ, sessionId);
     // attempt to Join this BSS...
@@ -7328,7 +7334,7 @@ eHalStatus csrRoamIssueJoin( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDes
     return (status);
 }
 
-static eHalStatus csrRoamIssueReassociate( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDescription *pSirBssDesc, 
+static eHalStatus csrRoamIssueReassociate( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDescription *pSirBssDesc,
                               tDot11fBeaconIEs *pIes, tCsrRoamProfile *pProfile)
 {
     csrRoamStateChange( pMac, eCSR_ROAMING_STATE_JOINING, sessionId);
@@ -7336,7 +7342,7 @@ static eHalStatus csrRoamIssueReassociate( tpAniSirGlobal pMac, tANI_U32 session
     csrRoamSubstateChange( pMac, eCSR_ROAM_SUBSTATE_REASSOC_REQ, sessionId );
 
     smsLog(pMac, LOGE, FL(" calling csrSendJoinReqMsg (eWNI_SME_REASSOC_REQ)"));
-    
+
     // attempt to Join this BSS...
     return csrSendJoinReqMsg( pMac, sessionId, pSirBssDesc, pProfile, pIes, eWNI_SME_REASSOC_REQ);
 }
@@ -7348,7 +7354,7 @@ void csrRoamReissueRoamCommand(tpAniSirGlobal pMac)
     tCsrRoamInfo roamInfo;
     tANI_U32 sessionId;
     tCsrRoamSession *pSession;
-            
+
     pEntry = csrLLPeekHead(&pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK);
     if(pEntry)
     {
@@ -7363,7 +7369,7 @@ void csrRoamReissueRoamCommand(tpAniSirGlobal pMac)
                 smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
                 return;
             }
-            
+
             if( pCommand->u.roamCmd.fStopWds )
             {
                 vos_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0);
@@ -7372,16 +7378,16 @@ void csrRoamReissueRoamCommand(tpAniSirGlobal pMac)
                 roamInfo.reasonCode = pSession->joinFailStatusCode.reasonCode;
                 if (CSR_IS_WDS(&pSession->connectedProfile)){
                 pSession->connectState = eCSR_ASSOC_STATE_TYPE_WDS_DISCONNECTED;
-                csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId, 
-                                        eCSR_ROAM_WDS_IND, 
+                csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
+                                        eCSR_ROAM_WDS_IND,
                                         eCSR_ROAM_RESULT_WDS_DISASSOCIATED);
                                 }else if (CSR_IS_INFRA_AP(&pSession->connectedProfile)){
                                         pSession->connectState = eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTED;
                                         csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
                                                                                 eCSR_ROAM_INFRA_IND,
                                                                                 eCSR_ROAM_RESULT_INFRA_DISASSOCIATED);
-                                }  
- 
+                                }
+
 
                 if( !HAL_STATUS_SUCCESS( csrRoamIssueStopBss( pMac, sessionId, eCSR_ROAM_SUBSTATE_STOP_BSS_REQ ) ) )
                 {
@@ -7400,7 +7406,7 @@ void csrRoamReissueRoamCommand(tpAniSirGlobal pMac)
             smsLog(pMac, LOGW, "  Command is not roaming after disassociated");
         }
     }
-    else 
+    else
     {
         smsLog(pMac, LOGE, "   Disassoc rsp cannot continue because no command is available");
     }
@@ -7481,8 +7487,8 @@ tANI_BOOLEAN csrIsScanForRoamCommandActive( tpAniSirGlobal pMac )
     if( pEntry )
     {
         pCommand = GET_BASE_ADDR(pEntry, tCsrCmd, Link);
-        if( ( eCsrRoamCommandScan == pCommand->command ) && 
-            ( ( eCsrScanForSsid == pCommand->u.scanCmd.reason ) || 
+        if( ( eCsrRoamCommandScan == pCommand->command ) &&
+            ( ( eCsrScanForSsid == pCommand->u.scanCmd.reason ) ||
               ( eCsrScanForCapsChange == pCommand->u.scanCmd.reason ) ||
               ( eCsrScanP2PFindPeer == pCommand->u.scanCmd.reason ) ) )
         {
@@ -7498,13 +7504,13 @@ eHalStatus csrRoamIssueReassociateCmd( tpAniSirGlobal pMac, tANI_U32 sessionId )
     tSmeCmd *pCommand = NULL;
     tANI_BOOLEAN fHighPriority = eANI_BOOLEAN_TRUE;
     tANI_BOOLEAN fRemoveCmd = FALSE;
-    tListElem *pEntry; 
+    tListElem *pEntry;
     // Delete the old assoc command. All is setup for reassoc to be serialized
     pEntry = csrLLPeekHead( &pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK );
     if ( pEntry )
     {
         pCommand = GET_BASE_ADDR( pEntry, tSmeCmd, Link );
-        if ( !pCommand ) 
+        if ( !pCommand )
         {
             smsLog( pMac, LOGE, FL(" fail to get command buffer") );
             return eHAL_STATUS_RESOURCES;
@@ -7515,7 +7521,7 @@ eHalStatus csrRoamIssueReassociateCmd( tpAniSirGlobal pMac, tANI_U32 sessionId )
             {
                 fRemoveCmd = csrLLRemoveEntry( &pMac->sme.smeCmdActiveList, pEntry, LL_ACCESS_LOCK );
             }
-            else 
+            else
             {
                 smsLog( pMac, LOGE, FL(" Unexpected active roam command present ") );
             }
@@ -7532,7 +7538,7 @@ eHalStatus csrRoamIssueReassociateCmd( tpAniSirGlobal pMac, tANI_U32 sessionId )
         smsLog( pMac, LOGE, FL(" fail to get command buffer as expected based on previous connect roam command") );
         return eHAL_STATUS_RESOURCES;
     }
-    do 
+    do
     {
         //Change the substate in case it is wait-for-key
         if( CSR_IS_WAIT_FOR_KEY( pMac, sessionId ) )
@@ -7575,12 +7581,12 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return;
     }
-    
+
     if(CSR_IS_ROAMING(pSession) && pSession->fCancelRoaming)
     {
         //the roaming is cancelled. Simply complete the command
         smsLog(pMac, LOGW, FL("  Roam command cancelled"));
-        csrRoamComplete(pMac, eCsrNothingToJoin, NULL); 
+        csrRoamComplete(pMac, eCsrNothingToJoin, NULL);
     }
     /* If the roaming has stopped, not to continue the roaming command*/
     else if ( !CSR_IS_ROAMING(pSession) && CSR_IS_ROAMING_COMMAND(pCommand) )
@@ -7604,12 +7610,12 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res
                 pBssDesc = &pScanResult->Result.BssDescriptor;
             }
             if ( csrIsBssTypeIBSS( pCommand->u.roamCmd.roamProfile.BSSType ) ||
-                 CSR_IS_WDS( &pCommand->u.roamCmd.roamProfile ) 
-                  || CSR_IS_INFRA_AP(&pCommand->u.roamCmd.roamProfile) 
+                 CSR_IS_WDS( &pCommand->u.roamCmd.roamProfile )
+                  || CSR_IS_INFRA_AP(&pCommand->u.roamCmd.roamProfile)
             )
             {
                 if(!HAL_STATUS_SUCCESS(csrRoamIssueStartBss( pMac, sessionId,
-                                        &pSession->bssParams, &pCommand->u.roamCmd.roamProfile, 
+                                        &pSession->bssParams, &pCommand->u.roamCmd.roamProfile,
                                         pBssDesc, pCommand->u.roamCmd.roamId )))
                 {
                     smsLog(pMac, LOGW, " CSR start BSS failed");
@@ -7625,7 +7631,7 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res
                     //We need to complete the command
                     csrRoamComplete(pMac, eCsrJoinFailure, NULL);
                     return;
-                } 
+                }
                 if ( NULL == pScanResult)
                 {
                    // If we are roaming TO an Infrastructure BSS...
@@ -7641,7 +7647,7 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res
                     if( csrIsConnStateConnectedInfra( pMac, sessionId ) )
                     {
                         // ...and the SSIDs are equal, then we Reassoc.
-                        if (  csrIsSsidEqual( pMac, pSession->pConnectBssDesc, pBssDesc, 
+                        if (  csrIsSsidEqual( pMac, pSession->pConnectBssDesc, pBssDesc,
                                                     pIesLocal ) )
                         // ..and currently in an infrastructure connection
                         {
@@ -7652,11 +7658,11 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res
                         }
                         else
                         {
-                                                     
+
                             // otherwise, we have to issue a new Join request to LIM because we disassociated from the
                             // previously associated AP.
-                            if(!HAL_STATUS_SUCCESS(csrRoamIssueJoin( pMac, sessionId, pBssDesc, 
-                                                                                                            pIesLocal, 
+                            if(!HAL_STATUS_SUCCESS(csrRoamIssueJoin( pMac, sessionId, pBssDesc,
+                                                                                                            pIesLocal,
                                                     &pCommand->u.roamCmd.roamProfile, pCommand->u.roamCmd.roamId )))
                             {
                                 //try something else
@@ -7667,22 +7673,22 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res
                     else
                     {
                         eHalStatus  status = eHAL_STATUS_SUCCESS;
-                         
+
                         /* We need to come with other way to figure out that this is because of HO in BMP
                            The below API will be only available for Android as it uses a different HO algorithm */
-                        /* Reassoc request will be used only for CCX and 11r handoff whereas other legacy roaming should 
+                        /* Reassoc request will be used only for CCX and 11r handoff whereas other legacy roaming should
                          * use join request */
 #ifdef WLAN_FEATURE_VOWIFI_11R
-                        if (csrRoamIsHandoffInProgress(pMac) && 
+                        if (csrRoamIsHandoffInProgress(pMac) &&
                                                 csrRoamIs11rAssoc(pMac))
                         {
-                            status = csrRoamIssueReassociate(pMac, sessionId, pBssDesc, 
+                            status = csrRoamIssueReassociate(pMac, sessionId, pBssDesc,
                                     (tDot11fBeaconIEs *)( pScanResult->Result.pvIes ), &pCommand->u.roamCmd.roamProfile);
                         }
                         else
 #endif
 #ifdef FEATURE_WLAN_CCX
-                        if (csrRoamIsHandoffInProgress(pMac) && 
+                        if (csrRoamIsHandoffInProgress(pMac) &&
                                                 csrRoamIsCCXAssoc(pMac))
                         {
                             // Now serialize the reassoc command.
@@ -7691,7 +7697,7 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res
                         else
 #endif
 #ifdef FEATURE_WLAN_LFR
-                        if (csrRoamIsHandoffInProgress(pMac) && 
+                        if (csrRoamIsHandoffInProgress(pMac) &&
                                                 csrRoamIsFastRoamEnabled(pMac, sessionId))
                         {
                             // Now serialize the reassoc command.
@@ -7702,7 +7708,7 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res
                         // else we are not connected and attempting to Join.  Issue the
                         // Join request.
                         {
-                            status = csrRoamIssueJoin( pMac, sessionId, pBssDesc, 
+                            status = csrRoamIssueJoin( pMac, sessionId, pBssDesc,
                                                 (tDot11fBeaconIEs *)( pScanResult->Result.pvIes ),
                                                 &pCommand->u.roamCmd.roamProfile, pCommand->u.roamCmd.roamId );
                         }
@@ -7727,7 +7733,7 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res
         }//if ( WNI_CFG_SUCCESS == result )
         else
         {
-            // In the event the configuration failed,  for infra let the roam processor 
+            // In the event the configuration failed,  for infra let the roam processor
             //attempt to join something else...
             if( pCommand->u.roamCmd.pRoamBssEntry && CSR_IS_INFRASTRUCTURE( &pCommand->u.roamCmd.roamProfile ) )
             {
@@ -7753,7 +7759,7 @@ static void csrRoamRoamingStateAuthRspProcessor( tpAniSirGlobal pMac, tSirSmeAut
 {
     //No one is sending eWNI_SME_AUTH_REQ to PE.
     smsLog(pMac, LOGW, FL("is no-op"));
-    if ( eSIR_SME_SUCCESS == pSmeAuthRsp->statusCode ) 
+    if ( eSIR_SME_SUCCESS == pSmeAuthRsp->statusCode )
     {
         smsLog( pMac, LOGW, "CSR SmeAuthReq Successful" );
         // Successfully authenticated with a new Bss.  Attempt to stop the current Bss and
@@ -7775,14 +7781,14 @@ static void csrRoamRoamingStateReassocRspProcessor( tpAniSirGlobal pMac, tpSirSm
     tpCsrNeighborRoamControlInfo    pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
     tCsrRoamInfo roamInfo;
     tANI_U32 roamId = 0;
-    
-    if ( eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode ) 
+
+    if ( eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode )
     {
         smsLog( pMac, LOGW, "CSR SmeReassocReq Successful" );
         result = eCsrReassocSuccess;
         /* Defeaturize this part later if needed */
 #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
-        /* Since the neighbor roam algorithm uses reassoc req for handoff instead of join, 
+        /* Since the neighbor roam algorithm uses reassoc req for handoff instead of join,
          * we need the response contents while processing the result in csrRoamProcessResults() */
         if (csrRoamIsHandoffInProgress(pMac))
         {
@@ -7806,7 +7812,7 @@ static void csrRoamRoamingStateReassocRspProcessor( tpAniSirGlobal pMac, tpSirSm
         if ((eSIR_SME_FT_REASSOC_TIMEOUT_FAILURE == pSmeJoinRsp->statusCode) ||
                         (eSIR_SME_FT_REASSOC_FAILURE == pSmeJoinRsp->statusCode))
         {
-                // Inform HDD to turn off FT flag in HDD 
+                // Inform HDD to turn off FT flag in HDD
                 if (pNeighborRoamInfo)
                 {
                         vos_mem_zero(&roamInfo, sizeof(tCsrRoamInfo));
@@ -7814,12 +7820,12 @@ static void csrRoamRoamingStateReassocRspProcessor( tpAniSirGlobal pMac, tpSirSm
                                         &roamInfo, roamId, eCSR_ROAM_FT_REASSOC_FAILED, eSIR_SME_SUCCESS);
                         /*
                          * Since the above callback sends a disconnect
-                         * to HDD, we should clean-up our state 
+                         * to HDD, we should clean-up our state
                          * machine as well to be in sync with the upper
-                         * layers. There is no need to send a disassoc 
-                         * since: 1) we will never reassoc to the current 
-                         * AP in LFR, and 2) there is no need to issue a 
-                         * disassoc to the AP with which we were trying 
+                         * layers. There is no need to send a disassoc
+                         * since: 1) we will never reassoc to the current
+                         * AP in LFR, and 2) there is no need to issue a
+                         * disassoc to the AP with which we were trying
                          * to reassoc.
                          */
                         csrRoamComplete( pMac, eCsrJoinFailure, NULL );
@@ -7903,7 +7909,7 @@ void csrRoamRoamingStateDisassocRspProcessor( tpAniSirGlobal pMac, tSirSmeDisass
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return;
     }
-    
+
     if ( CSR_IS_ROAM_SUBSTATE_DISASSOC_NO_JOIN( pMac, sessionId ) )
     {
         csrRoamComplete( pMac, eCsrNothingToJoin, NULL );
@@ -7915,7 +7921,7 @@ void csrRoamRoamingStateDisassocRspProcessor( tpAniSirGlobal pMac, tSirSmeDisass
         {
             smsLog( pMac, LOG2, "CSR SmeDisassocReq force disassociated Successfully" );
             //A callback to HDD will be issued from csrRoamComplete so no need to do anything here
-        } 
+        }
         csrRoamComplete( pMac, eCsrNothingToJoin, NULL );
     }
     else if ( CSR_IS_ROAM_SUBSTATE_DISASSOC_HO( pMac, sessionId ) )
@@ -7934,7 +7940,7 @@ void csrRoamRoamingStateDisassocRspProcessor( tpAniSirGlobal pMac, tSirSmeDisass
        if(HAL_STATUS_SUCCESS(status))
        {
            vos_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0);
-           status = csrRoamPrepareFilterFromProfile(pMac, 
+           status = csrRoamPrepareFilterFromProfile(pMac,
                     &pMac->roam.neighborRoamInfo.csrNeighborRoamProfile, pScanFilter);
            if(!HAL_STATUS_SUCCESS(status))
            {
@@ -7975,7 +7981,7 @@ void csrRoamRoamingStateDisassocRspProcessor( tpAniSirGlobal pMac, tSirSmeDisass
             {
 
                 /*
-                 * we need to process the result first before removing it from active list 
+                 * we need to process the result first before removing it from active list
                  * because state changes still happening insides roamQProcessRoamResults so
                  * no other roam command should be issued.
                  */
@@ -8010,7 +8016,7 @@ void csrRoamRoamingStateDisassocRspProcessor( tpAniSirGlobal pMac, tSirSmeDisass
                      pMac->roam.neighborRoamInfo.csrNeighborRoamProfile.BSSIDs.bssid,
                      sizeof(tSirMacAddr));
 
-        csrRoamCallCallback(pMac,sessionId, &roamInfo, 0, 
+        csrRoamCallCallback(pMac,sessionId, &roamInfo, 0,
             eCSR_ROAM_ROAMING_START, eCSR_ROAM_RESULT_NONE);
 
         /* Copy the connected profile to apply the same for this connection as well */
@@ -8020,8 +8026,8 @@ void csrRoamRoamingStateDisassocRspProcessor( tpAniSirGlobal pMac, tSirSmeDisass
             vos_mem_set(pCurRoamProfile, sizeof(tCsrRoamProfile), 0);
             csrRoamCopyProfile(pMac, pCurRoamProfile, pSession->pCurRoamProfile);
             //make sure to put it at the head of the cmd queue
-            status = csrRoamIssueConnect(pMac, sessionId, pCurRoamProfile, 
-                    hBSSList, eCsrSmeIssuedAssocToSimilarAP, 
+            status = csrRoamIssueConnect(pMac, sessionId, pCurRoamProfile,
+                    hBSSList, eCsrSmeIssuedAssocToSimilarAP,
                     roamId, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_FALSE);
 
             if(!HAL_STATUS_SUCCESS(status))
@@ -8030,7 +8036,7 @@ void csrRoamRoamingStateDisassocRspProcessor( tpAniSirGlobal pMac, tSirSmeDisass
                         __func__, status);
                 fCallCallback = eANI_BOOLEAN_TRUE;
             }
-        
+
             /* Notify sub-modules like QoS etc. that handoff happening */
             sme_QosCsrEventInd(pMac, sessionId, SME_QOS_CSR_HANDOFF_ASSOC_REQ, NULL);
             csrReleaseProfile(pMac, pCurRoamProfile);
@@ -8054,14 +8060,14 @@ POST_ROAM_FAILURE:
         csrRoamCallCallback(pMac, sessionId,
                 &roamInfo, 0, eCSR_ROAM_FT_REASSOC_FAILED, eSIR_SME_SUCCESS);
 
-        /* 
+        /*
          * Issue a disassoc request so that PE/LIM uses this to clean-up the FT session.
          * Upon success, we would re-enter this routine after receiving the disassoc
          * response and will fall into the reassoc fail sub-state. And, eventually
-         * call csrRoamComplete which would remove the roam command from SME active 
+         * call csrRoamComplete which would remove the roam command from SME active
          * queue.
          */
-        if (!HAL_STATUS_SUCCESS(csrRoamIssueDisassociate(pMac, sessionId, 
+        if (!HAL_STATUS_SUCCESS(csrRoamIssueDisassociate(pMac, sessionId,
             eCSR_ROAM_SUBSTATE_DISASSOC_REASSOC_FAILURE, FALSE)))
         {
             smsLog( pMac, LOGE,"%s: csrRoamIssueDisassociate failed with status %d",
@@ -8088,7 +8094,7 @@ POST_ROAM_FAILURE:
             // Infrastructure network.
             // - Third is where we are doing an Infra to Infra roam between networks with different
             // SSIDs.  In all cases, we set the new Bss configuration here and attempt to join
-            
+
             smsLog( pMac, LOG2, "CSR SmeDisassocReq disassociated Successfully" );
         }
         else
@@ -8112,7 +8118,7 @@ static void csrRoamRoamingStateDeauthRspProcessor( tpAniSirGlobal pMac, tSirSmeD
     }
     else
     {
-        if ( eSIR_SME_SUCCESS == statusCode ) 
+        if ( eSIR_SME_SUCCESS == statusCode )
         {
             // Successfully deauth from the 'old' Bss...
             //
@@ -8130,13 +8136,13 @@ static void csrRoamRoamingStateDeauthRspProcessor( tpAniSirGlobal pMac, tSirSmeD
 static void csrRoamRoamingStateStartBssRspProcessor( tpAniSirGlobal pMac, tSirSmeStartBssRsp *pSmeStartBssRsp )
 {
     eCsrRoamCompleteResult result;
-    
-    if ( eSIR_SME_SUCCESS == pSmeStartBssRsp->statusCode ) 
+
+    if ( eSIR_SME_SUCCESS == pSmeStartBssRsp->statusCode )
     {
         smsLog( pMac, LOGW, "SmeStartBssReq Successful" );
         result = eCsrStartBssSuccess;
     }
-    else 
+    else
     {
         smsLog( pMac, LOGW, "SmeStartBssReq failed with statusCode= 0x%08X", pSmeStartBssRsp->statusCode );
         //Let csrRoamComplete decide what to do
@@ -8149,7 +8155,7 @@ static void csrRoamRoamingStateStartBssRspProcessor( tpAniSirGlobal pMac, tSirSm
   We need to be careful on whether to cast pMsgBuf (pSmeRsp) to other type of strucutres.
   It depends on how the message is constructed. If the message is sent by limSendSmeRsp,
   the pMsgBuf is only a generic response and can only be used as pointer to tSirSmeRsp.
-  For the messages where sender allocates memory for specific structures, then it can be 
+  For the messages where sender allocates memory for specific structures, then it can be
   cast accordingly.
 */
 void csrRoamingStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
@@ -8166,9 +8172,9 @@ void csrRoamingStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
     pSmeRsp->messageType = (pSmeRsp->messageType);
     pSmeRsp->length = (pSmeRsp->length);
     pSmeRsp->statusCode = (pSmeRsp->statusCode);
-    switch (pSmeRsp->messageType) 
+    switch (pSmeRsp->messageType)
     {
-        
+
         case eWNI_SME_JOIN_RSP:      // in Roaming state, process the Join response message...
             if (CSR_IS_ROAM_SUBSTATE_JOIN_REQ(pMac, pSmeRsp->sessionId))
             {
@@ -8176,28 +8182,28 @@ void csrRoamingStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
                 csrRoamJoinRspProcessor( pMac, (tSirSmeJoinRsp *)pSmeRsp );
             }
             break;
-                
+
         case eWNI_SME_AUTH_RSP:       // or the Authenticate response message...
-            if (CSR_IS_ROAM_SUBSTATE_AUTH_REQ( pMac, pSmeRsp->sessionId) ) 
+            if (CSR_IS_ROAM_SUBSTATE_AUTH_REQ( pMac, pSmeRsp->sessionId) )
             {
                 //We sent a AUTH_REQ
                 csrRoamRoamingStateAuthRspProcessor( pMac, (tSirSmeAuthRsp *)pSmeRsp );
             }
             break;
-                
+
         case eWNI_SME_REASSOC_RSP:     // or the Reassociation response message...
-            if (CSR_IS_ROAM_SUBSTATE_REASSOC_REQ( pMac, pSmeRsp->sessionId) ) 
+            if (CSR_IS_ROAM_SUBSTATE_REASSOC_REQ( pMac, pSmeRsp->sessionId) )
             {
                 csrRoamRoamingStateReassocRspProcessor( pMac, (tpSirSmeJoinRsp )pSmeRsp );
             }
             break;
-                   
+
         case eWNI_SME_STOP_BSS_RSP:    // or the Stop Bss response message...
             {
                 csrRoamRoamingStateStopBssRspProcessor(pMac, pSmeRsp);
             }
             break;
-                
+
         case eWNI_SME_DISASSOC_RSP:    // or the Disassociate response message...
             if ( CSR_IS_ROAM_SUBSTATE_DISASSOC_REQ( pMac, pSmeRsp->sessionId )      ||
                  CSR_IS_ROAM_SUBSTATE_DISASSOC_NO_JOIN( pMac, pSmeRsp->sessionId )  ||
@@ -8211,23 +8217,23 @@ void csrRoamingStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
                 csrRoamRoamingStateDisassocRspProcessor( pMac, (tSirSmeDisassocRsp *)pSmeRsp );
             }
             break;
-                   
+
         case eWNI_SME_DEAUTH_RSP:    // or the Deauthentication response message...
-            if ( CSR_IS_ROAM_SUBSTATE_DEAUTH_REQ( pMac, pSmeRsp->sessionId ) ) 
+            if ( CSR_IS_ROAM_SUBSTATE_DEAUTH_REQ( pMac, pSmeRsp->sessionId ) )
             {
                 csrRoamRoamingStateDeauthRspProcessor( pMac, (tSirSmeDeauthRsp *)pSmeRsp );
             }
             break;
-                   
+
         case eWNI_SME_START_BSS_RSP:      // or the Start BSS response message...
-            if (CSR_IS_ROAM_SUBSTATE_START_BSS_REQ( pMac, pSmeRsp->sessionId ) ) 
+            if (CSR_IS_ROAM_SUBSTATE_START_BSS_REQ( pMac, pSmeRsp->sessionId ) )
             {
                 csrRoamRoamingStateStartBssRspProcessor( pMac, (tSirSmeStartBssRsp *)pSmeRsp );
-            } 
+            }
             break;
-                   
+
         case WNI_CFG_SET_CNF:    // process the Config Confirm messages when we are in 'Config' substate...
-            if ( CSR_IS_ROAM_SUBSTATE_CONFIG( pMac, pSmeRsp->sessionId ) ) 
+            if ( CSR_IS_ROAM_SUBSTATE_CONFIG( pMac, pSmeRsp->sessionId ) )
             {
                 csrRoamingStateConfigCnfProcessor( pMac, ((tCsrCfgSetRsp *)pSmeRsp)->respStatus );
             }
@@ -8242,8 +8248,8 @@ void csrRoamingStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
             roamInfo.bcastSig = (tANI_U8)pIbssPeerInd->bcastSig;
             vos_mem_copy(&roamInfo.peerMac, pIbssPeerInd->peerAddr,
                          sizeof(tCsrBssid));
-            csrRoamCallCallback(pMac, sessionId, &roamInfo, 0, 
-                                eCSR_ROAM_CONNECT_STATUS_UPDATE, 
+            csrRoamCallCallback(pMac, sessionId, &roamInfo, 0,
+                                eCSR_ROAM_CONNECT_STATUS_UPDATE,
                                 eCSR_ROAM_RESULT_IBSS_PEER_DEPARTED);
             break;
         default:
@@ -8251,19 +8257,19 @@ void csrRoamingStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
                       pSmeRsp->messageType, pSmeRsp->messageType,
                       pMac->roam.curSubState[pSmeRsp->sessionId] );
 
-            //If we are connected, check the link status change 
+            //If we are connected, check the link status change
                         if(!csrIsConnStateDisconnected(pMac, sessionId))
                         {
                                 csrRoamCheckForLinkStatusChange( pMac, pSmeRsp );
                         }
-            break;          
+            break;
     }
 }
 
 void csrRoamJoinedStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
 {
     tSirSmeRsp *pSirMsg = (tSirSmeRsp *)pMsgBuf;
-    switch (pSirMsg->messageType) 
+    switch (pSirMsg->messageType)
     {
        case eWNI_SME_GET_STATISTICS_RSP:
           smsLog( pMac, LOG2, FL("Stats rsp from PE"));
@@ -8289,14 +8295,14 @@ void csrRoamJoinedStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
                 smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
                 return;
             }
-            
-            pRoamInfo->statusCode = eSIR_SME_SUCCESS; //send the status code as Success 
+
+            pRoamInfo->statusCode = eSIR_SME_SUCCESS; //send the status code as Success
             pRoamInfo->u.pConnectedProfile = &pSession->connectedProfile;
             pRoamInfo->staId = (tANI_U8)pUpperLayerAssocCnf->aid;
             pRoamInfo->rsnIELen = (tANI_U8)pUpperLayerAssocCnf->rsnIE.length;
             pRoamInfo->prsnIE = pUpperLayerAssocCnf->rsnIE.rsnIEdata;
             pRoamInfo->addIELen = (tANI_U8)pUpperLayerAssocCnf->addIE.length;
-            pRoamInfo->paddIE = pUpperLayerAssocCnf->addIE.addIEdata;           
+            pRoamInfo->paddIE = pUpperLayerAssocCnf->addIE.addIEdata;
             vos_mem_copy(pRoamInfo->peerMac, pUpperLayerAssocCnf->peerMacAddr,
                          sizeof(tSirMacAddr));
             vos_mem_copy(&pRoamInfo->bssid, pUpperLayerAssocCnf->bssId,
@@ -8324,27 +8330,27 @@ void csrRoamJoinedStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
     }
 }
 
-eHalStatus csrRoamIssueSetContextReq( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrEncryptionType EncryptType, 
+eHalStatus csrRoamIssueSetContextReq( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrEncryptionType EncryptType,
                                      tSirBssDescription *pBssDescription,
                                 tSirMacAddr *bssId, tANI_BOOLEAN addKey,
-                                 tANI_BOOLEAN fUnicast, tAniKeyDirection aniKeyDirection, 
-                                 tANI_U8 keyId, tANI_U16 keyLength, 
+                                 tANI_BOOLEAN fUnicast, tAniKeyDirection aniKeyDirection,
+                                 tANI_U8 keyId, tANI_U16 keyLength,
                                  tANI_U8 *pKey, tANI_U8 paeRole )
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tAniEdType edType;
-    
+
     if(eCSR_ENCRYPT_TYPE_UNKNOWN == EncryptType)
     {
         EncryptType = eCSR_ENCRYPT_TYPE_NONE; //***
     }
-    
+
     edType = csrTranslateEncryptTypeToEdType( EncryptType );
-    
+
     // Allow 0 keys to be set for the non-WPA encrypt types...  For WPA encrypt types, the num keys must be non-zero
     // or LIM will reject the set context (assumes the SET_CONTEXT does not occur until the keys are distrubuted).
     if ( CSR_IS_ENC_TYPE_STATIC( EncryptType ) ||
-           addKey )     
+           addKey )
     {
         tCsrRoamSetKey setKey;
         setKey.encType = EncryptType;
@@ -8352,7 +8358,7 @@ eHalStatus csrRoamIssueSetContextReq( tpAniSirGlobal pMac, tANI_U32 sessionId, e
         vos_mem_copy(&setKey.peerMac, bssId, sizeof(tCsrBssid));
         setKey.paeRole = paeRole;      //0 for supplicant
         setKey.keyId = keyId;  // Kye index
-        setKey.keyLength = keyLength;  
+        setKey.keyLength = keyLength;
         if( keyLength )
         {
             vos_mem_copy(setKey.Key, pKey, keyLength);
@@ -8362,7 +8368,7 @@ eHalStatus csrRoamIssueSetContextReq( tpAniSirGlobal pMac, tANI_U32 sessionId, e
     return (status);
 }
 
-static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessionId, 
+static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessionId,
                                              tCsrRoamSetKey *pSetKey, tANI_U32 roamId )
 {
     eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
@@ -8370,7 +8376,7 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi
 #ifdef FEATURE_WLAN_CCX
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
 #endif /* FEATURE_WLAN_CCX */
- 
+
     do
     {
         pCommand = csrGetCommandBuffer(pMac);
@@ -8384,41 +8390,41 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi
         pCommand->sessionId = (tANI_U8)sessionId;
         // validate the key length,  Adjust if too long...
         // for static WEP the keys are not set thru' SetContextReq
-        if ( ( eCSR_ENCRYPT_TYPE_WEP40 == pSetKey->encType ) || 
-             ( eCSR_ENCRYPT_TYPE_WEP40_STATICKEY == pSetKey->encType ) ) 
+        if ( ( eCSR_ENCRYPT_TYPE_WEP40 == pSetKey->encType ) ||
+             ( eCSR_ENCRYPT_TYPE_WEP40_STATICKEY == pSetKey->encType ) )
         {
             //KeyLength maybe 0 for static WEP
             if( pSetKey->keyLength )
             {
-                if ( pSetKey->keyLength < CSR_WEP40_KEY_LEN ) 
+                if ( pSetKey->keyLength < CSR_WEP40_KEY_LEN )
                 {
                     smsLog( pMac, LOGW, "Invalid WEP40 keylength [= %d] in SetContext call", pSetKey->keyLength );
-                    break;        
+                    break;
                 }
-                
+
                 pCommand->u.setKeyCmd.keyLength = CSR_WEP40_KEY_LEN;
                 vos_mem_copy(pCommand->u.setKeyCmd.Key, pSetKey->Key,
                              CSR_WEP40_KEY_LEN);
             }
         }
-        else if ( ( eCSR_ENCRYPT_TYPE_WEP104 == pSetKey->encType ) || 
-             ( eCSR_ENCRYPT_TYPE_WEP104_STATICKEY == pSetKey->encType ) ) 
+        else if ( ( eCSR_ENCRYPT_TYPE_WEP104 == pSetKey->encType ) ||
+             ( eCSR_ENCRYPT_TYPE_WEP104_STATICKEY == pSetKey->encType ) )
         {
             //KeyLength maybe 0 for static WEP
             if( pSetKey->keyLength )
             {
-                if ( pSetKey->keyLength < CSR_WEP104_KEY_LEN ) 
+                if ( pSetKey->keyLength < CSR_WEP104_KEY_LEN )
                 {
                     smsLog( pMac, LOGW, "Invalid WEP104 keylength [= %d] in SetContext call", pSetKey->keyLength );
-                    break;        
+                    break;
                 }
-                
+
                 pCommand->u.setKeyCmd.keyLength = CSR_WEP104_KEY_LEN;
                 vos_mem_copy(pCommand->u.setKeyCmd.Key, pSetKey->Key,
                              CSR_WEP104_KEY_LEN);
             }
         }
-        else if ( eCSR_ENCRYPT_TYPE_TKIP == pSetKey->encType ) 
+        else if ( eCSR_ENCRYPT_TYPE_TKIP == pSetKey->encType )
         {
             if ( pSetKey->keyLength < CSR_TKIP_KEY_LEN )
             {
@@ -8429,7 +8435,7 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi
             vos_mem_copy(pCommand->u.setKeyCmd.Key, pSetKey->Key,
                          CSR_TKIP_KEY_LEN);
         }
-        else if ( eCSR_ENCRYPT_TYPE_AES == pSetKey->encType ) 
+        else if ( eCSR_ENCRYPT_TYPE_AES == pSetKey->encType )
         {
             if ( pSetKey->keyLength < CSR_AES_KEY_LEN )
             {
@@ -8441,7 +8447,7 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi
                          CSR_AES_KEY_LEN);
         }
 #ifdef FEATURE_WLAN_WAPI
-        else if ( eCSR_ENCRYPT_TYPE_WPI == pSetKey->encType ) 
+        else if ( eCSR_ENCRYPT_TYPE_WPI == pSetKey->encType )
         {
             if ( pSetKey->keyLength < CSR_WAPI_KEY_LEN )
             {
@@ -8454,7 +8460,7 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi
         }
 #endif /* FEATURE_WLAN_WAPI */
 #ifdef FEATURE_WLAN_CCX
-        else if ( eCSR_ENCRYPT_TYPE_KRK == pSetKey->encType ) 
+        else if ( eCSR_ENCRYPT_TYPE_KRK == pSetKey->encType )
         {
             if ( pSetKey->keyLength < CSR_KRK_KEY_LEN )
             {
@@ -8493,19 +8499,19 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi
         pCommand->u.setKeyCmd.keyId = pSetKey->keyId;
         vos_mem_copy(pCommand->u.setKeyCmd.keyRsc, pSetKey->keyRsc, CSR_MAX_RSC_LEN);
         //Always put set key to the head of the Q because it is the only thing to get executed in case of WT_KEY state
-         
+
         status = csrQueueSmeCommand(pMac, pCommand, eANI_BOOLEAN_TRUE);
         if( !HAL_STATUS_SUCCESS( status ) )
         {
             smsLog( pMac, LOGE, FL(" fail to send message status = %d"), status );
         }
     } while (0);
-    // Free the command if there has been a failure, or it is a 
+    // Free the command if there has been a failure, or it is a
     // "local" operation like the set CCX CCKM KRK key.
     if ( ( NULL != pCommand ) &&
          ( (!HAL_STATUS_SUCCESS( status ) )
 #ifdef FEATURE_WLAN_CCX
-            || ( eCSR_ENCRYPT_TYPE_KRK == pSetKey->encType ) 
+            || ( eCSR_ENCRYPT_TYPE_KRK == pSetKey->encType )
 #endif /* FEATURE_WLAN_CCX */
            ) )
     {
@@ -8522,7 +8528,7 @@ eHalStatus csrRoamIssueRemoveKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessionId
     tANI_BOOLEAN fImediate = eANI_BOOLEAN_TRUE;
     do
     {
-        if( !csrIsSetKeyAllowed(pMac, sessionId) ) 
+        if( !csrIsSetKeyAllowed(pMac, sessionId) )
         {
             smsLog( pMac, LOGW, FL(" wrong state not allowed to set key") );
             status = eHAL_STATUS_CSR_WRONG_STATE;
@@ -8616,11 +8622,11 @@ eHalStatus csrRoamProcessSetKeyCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
 #endif //FEATURE_WLAN_DIAG_SUPPORT_CSR
     if( csrIsSetKeyAllowed(pMac, sessionId) )
     {
-        status = csrSendMBSetContextReqMsg( pMac, sessionId, 
-                    ( tANI_U8 *)&pCommand->u.setKeyCmd.peerMac, 
-                                            numKeys, edType, fUnicast, pCommand->u.setKeyCmd.keyDirection, 
-                                            pCommand->u.setKeyCmd.keyId, pCommand->u.setKeyCmd.keyLength, 
-                    pCommand->u.setKeyCmd.Key, pCommand->u.setKeyCmd.paeRole, 
+        status = csrSendMBSetContextReqMsg( pMac, sessionId,
+                    ( tANI_U8 *)&pCommand->u.setKeyCmd.peerMac,
+                                            numKeys, edType, fUnicast, pCommand->u.setKeyCmd.keyDirection,
+                                            pCommand->u.setKeyCmd.keyId, pCommand->u.setKeyCmd.keyLength,
+                    pCommand->u.setKeyCmd.Key, pCommand->u.setKeyCmd.paeRole,
                     pCommand->u.setKeyCmd.keyRsc);
     }
     else
@@ -8713,7 +8719,7 @@ eHalStatus csrRoamProcessRemoveKeyCommand( tpAniSirGlobal pMac, tSmeCmd *pComman
         *p = (tANI_U8)csrTranslateEncryptTypeToEdType( pCommand->u.removeKeyCmd.encType );
         p++;
         // weptype
-        if( ( eCSR_ENCRYPT_TYPE_WEP40_STATICKEY == pCommand->u.removeKeyCmd.encType ) || 
+        if( ( eCSR_ENCRYPT_TYPE_WEP40_STATICKEY == pCommand->u.removeKeyCmd.encType ) ||
             ( eCSR_ENCRYPT_TYPE_WEP104_STATICKEY == pCommand->u.removeKeyCmd.encType ) )
         {
             *p = (tANI_U8)eSIR_WEP_STATIC;
@@ -8745,7 +8751,7 @@ eHalStatus csrRoamProcessRemoveKeyCommand( tpAniSirGlobal pMac, tSmeCmd *pComman
 eHalStatus csrRoamSetKey( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamSetKey *pSetKey, tANI_U32 roamId )
 {
     eHalStatus status;
- 
+
     if( !csrIsSetKeyAllowed(pMac, sessionId) )
     {
         status = eHAL_STATUS_CSR_WRONG_STATE;
@@ -8759,16 +8765,16 @@ eHalStatus csrRoamSetKey( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamSetKe
 
 /*
    Prepare a filter base on a profile for parsing the scan results.
-   Upon successful return, caller MUST call csrFreeScanFilter on 
+   Upon successful return, caller MUST call csrFreeScanFilter on
    pScanFilter when it is done with the filter.
 */
-eHalStatus csrRoamPrepareFilterFromProfile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, 
+eHalStatus csrRoamPrepareFilterFromProfile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile,
                                            tCsrScanResultFilter *pScanFilter)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tANI_U32 size = 0;
     tANI_U8  index = 0;
-    
+
     do
     {
         if(pProfile->BSSIDs.numOfBSSIDs)
@@ -8833,11 +8839,11 @@ eHalStatus csrRoamPrepareFilterFromProfile(tpAniSirGlobal pMac, tCsrRoamProfile
               {
                  if(csrRoamIsChannelValid(pMac, pProfile->ChannelInfo.ChannelList[index]))
                  {
-                    pScanFilter->ChannelInfo.ChannelList[pScanFilter->ChannelInfo.numOfChannels] 
+                    pScanFilter->ChannelInfo.ChannelList[pScanFilter->ChannelInfo.numOfChannels]
                        = pProfile->ChannelInfo.ChannelList[index];
                     pScanFilter->ChannelInfo.numOfChannels++;
                  }
-                 else 
+                 else
                  {
                          smsLog(pMac, LOG1, FL("process a channel (%d) that is invalid"), pProfile->ChannelInfo.ChannelList[index]);
                  }
@@ -8848,7 +8854,7 @@ eHalStatus csrRoamPrepareFilterFromProfile(tpAniSirGlobal pMac, tCsrRoamProfile
                 break;
             }
         }
-        else 
+        else
         {
             smsLog(pMac, LOGW, FL("Channel list empty"));
             status = eHAL_STATUS_FAILURE;
@@ -8894,14 +8900,14 @@ eHalStatus csrRoamPrepareFilterFromProfile(tpAniSirGlobal pMac, tCsrRoamProfile
             pScanFilter->MDID.mobilityDomain = pProfile->MDID.mobilityDomain;
         }
 #endif
-    
+
     }while(0);
-    
+
     if(!HAL_STATUS_SUCCESS(status))
     {
         csrFreeScanFilter(pMac, pScanFilter);
     }
-    
+
     return(status);
 }
 
@@ -9215,7 +9221,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
     {   smsLog(pMac, LOGE, FL("pSirMsg is NULL"));
         return;
     }
-    switch( pSirMsg->messageType ) 
+    switch( pSirMsg->messageType )
     {
         case eWNI_SME_ASSOC_IND:
             {
@@ -9240,14 +9246,14 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                 pRoamInfo->assocReqPtr = pAssocInd->assocReqPtr;
 
                 pRoamInfo->beaconPtr = pAssocInd->beaconPtr;
-                pRoamInfo->beaconLength = pAssocInd->beaconLength;                
-                pRoamInfo->statusCode = eSIR_SME_SUCCESS; //send the status code as Success 
+                pRoamInfo->beaconLength = pAssocInd->beaconLength;
+                pRoamInfo->statusCode = eSIR_SME_SUCCESS; //send the status code as Success
                 pRoamInfo->u.pConnectedProfile = &pSession->connectedProfile;
 
                     pRoamInfo->staId = (tANI_U8)pAssocInd->staId;
                     pRoamInfo->rsnIELen = (tANI_U8)pAssocInd->rsnIE.length;
                     pRoamInfo->prsnIE = pAssocInd->rsnIE.rsnIEdata;
-                
+
                 pRoamInfo->addIELen = (tANI_U8)pAssocInd->addIE.length;
                 pRoamInfo->paddIE =  pAssocInd->addIE.addIEdata;
                     vos_mem_copy(pRoamInfo->peerMac, pAssocInd->peerMacAddr,
@@ -9262,7 +9268,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                     {
                         if( CSR_IS_ENC_TYPE_STATIC( pSession->pCurRoamProfile->negotiatedUCEncryptionType ))
                         {
-                            csrRoamIssueSetContextReq( pMac, sessionId, pSession->pCurRoamProfile->negotiatedUCEncryptionType, 
+                            csrRoamIssueSetContextReq( pMac, sessionId, pSession->pCurRoamProfile->negotiatedUCEncryptionType,
                                     pSession->pConnectBssDesc,
                                     &(pRoamInfo->peerMac),
                                     FALSE, TRUE, eSIR_TX_RX, 0, 0, NULL, 0 ); // NO keys... these key parameters don't matter.
@@ -9274,11 +9280,11 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                         }
                         status = csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0, eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND);
                         if (!HAL_STATUS_SUCCESS(status))
-                            pRoamInfo->statusCode = eSIR_SME_ASSOC_REFUSED;// Refused due to Mac filtering 
+                            pRoamInfo->statusCode = eSIR_SME_ASSOC_REFUSED;// Refused due to Mac filtering
                     }
                     /* Send Association completion message to PE */
                     status = csrSendAssocCnfMsg( pMac, pAssocInd, status );//Sta
-                    
+
                     /* send a message to CSR itself just to avoid the EAPOL frames going
                      * OTA before association response */
                     if(CSR_IS_WDS_AP( pRoamInfo->u.pConnectedProfile))
@@ -9309,7 +9315,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                                        pDisassocInd->reasonCode, pDisassocInd->statusCode);
                 // If we are in neighbor preauth done state then on receiving
                 // disassoc or deauth we dont roam instead we just disassoc
-                // from current ap and then go to disconnected state 
+                // from current ap and then go to disconnected state
                 // This happens for CCX and 11r FT connections ONLY.
 #ifdef WLAN_FEATURE_VOWIFI_11R
                 if (csrRoamIs11rAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac)))
@@ -9351,7 +9357,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
 
                     pRoamInfo = &roamInfo;
 
-                    pRoamInfo->statusCode = pDisassocInd->statusCode; 
+                    pRoamInfo->statusCode = pDisassocInd->statusCode;
                     pRoamInfo->u.pConnectedProfile = &pSession->connectedProfile;
 
                     pRoamInfo->staId = (tANI_U8)pDisassocInd->staId;
@@ -9364,7 +9370,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                     status = csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0, eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_DISASSOC_IND);
 
                     /*
-                    *  STA/P2P client got  disassociated so remove any pending deauth 
+                    *  STA/P2P client got  disassociated so remove any pending deauth
                     *  commands in sme pending list
                     */
                     pCommand.command = eSmeCommandRoam;
@@ -9390,7 +9396,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
             {
                 // If we are in neighbor preauth done state then on receiving
                 // disassoc or deauth we dont roam instead we just disassoc
-                // from current ap and then go to disconnected state 
+                // from current ap and then go to disconnected state
                 // This happens for CCX and 11r FT connections ONLY.
 #ifdef WLAN_FEATURE_VOWIFI_11R
                 if (csrRoamIs11rAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac)))
@@ -9446,7 +9452,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                 }
             }
             break;
-        
+
         case eWNI_SME_SWITCH_CHL_REQ:        // in case of STA, the SWITCH_CHANNEL originates from its AP
             smsLog( pMac, LOGW, FL("eWNI_SME_SWITCH_CHL_REQ from SME"));
             pSwitchChnInd = (tpSirSmeSwitchChannelInd)pSirMsg;
@@ -9468,14 +9474,14 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                 }
             }
             break;
-                
+
         case eWNI_SME_DEAUTH_RSP:
             smsLog( pMac, LOGW, FL("eWNI_SME_DEAUTH_RSP from SME"));
             {
                 tSirSmeDeauthRsp* pDeauthRsp = (tSirSmeDeauthRsp *)pSirMsg;
                 sessionId = pDeauthRsp->sessionId;
                 if( CSR_IS_SESSION_VALID(pMac, sessionId) )
-                {                    
+                {
                     pSession = CSR_GET_SESSION(pMac, sessionId);
                     if ( CSR_IS_INFRA_AP(&pSession->connectedProfile) )
                     {
@@ -9490,7 +9496,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                 }
             }
             break;
-            
+
         case eWNI_SME_DISASSOC_RSP:
             /* session id is invalid here so cant use it to access the array curSubstate as index */
             smsLog( pMac, LOGW, FL("eWNI_SME_DISASSOC_RSP from SME "));
@@ -9498,7 +9504,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                 tSirSmeDisassocRsp *pDisassocRsp = (tSirSmeDisassocRsp *)pSirMsg;
                 sessionId = pDisassocRsp->sessionId;
                 if( CSR_IS_SESSION_VALID(pMac, sessionId) )
-                {                    
+                {
                     pSession = CSR_GET_SESSION(pMac, sessionId);
                     if ( CSR_IS_INFRA_AP(&pSession->connectedProfile) )
                     {
@@ -9547,11 +9553,11 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
 
                     vos_mem_set(&secEvent, sizeof(vos_event_wlan_security_payload_type), 0);
                     secEvent.eventId = WLAN_SECURITY_EVENT_MIC_ERROR;
-                    secEvent.encryptionModeMulticast = 
+                    secEvent.encryptionModeMulticast =
                         (v_U8_t)diagEncTypeFromCSRType(pSession->connectedProfile.mcEncryptionType);
-                    secEvent.encryptionModeUnicast = 
+                    secEvent.encryptionModeUnicast =
                         (v_U8_t)diagEncTypeFromCSRType(pSession->connectedProfile.EncryptionType);
-                    secEvent.authMode = 
+                    secEvent.authMode =
                         (v_U8_t)diagAuthTypeFromCSRType(pSession->connectedProfile.AuthType);
                     vos_mem_copy(secEvent.bssid,
                                  pSession->connectedProfile.bssid, 6);
@@ -9564,21 +9570,21 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
             {
                 tpSirSmeProbeReqInd pProbeReqInd = (tpSirSmeProbeReqInd)pSirMsg;
                 smsLog( pMac, LOG1, FL("WPS PBC Probe request Indication from SME"));
-           
+
                 status = csrRoamGetSessionIdFromBSSID( pMac, (tCsrBssid *)pProbeReqInd->bssId, &sessionId );
                 if( HAL_STATUS_SUCCESS( status ) )
                 {
                     vos_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0);
                     roamInfo.u.pWPSPBCProbeReq = &pProbeReqInd->WPSPBCProbeReq;
-                    csrRoamCallCallback(pMac, sessionId, &roamInfo, 0, eCSR_ROAM_WPS_PBC_PROBE_REQ_IND, 
+                    csrRoamCallCallback(pMac, sessionId, &roamInfo, 0, eCSR_ROAM_WPS_PBC_PROBE_REQ_IND,
                         eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND);
                 }
             }
-            break;        
-            
+            break;
+
         case eWNI_SME_WM_STATUS_CHANGE_NTF:
             pStatusChangeMsg = (tSirSmeWmStatusChangeNtf *)pSirMsg;
-            switch( pStatusChangeMsg->statusChangeCode ) 
+            switch( pStatusChangeMsg->statusChangeCode )
             {
                 case eSIR_SME_IBSS_ACTIVE:
                     sessionId = csrFindIbssSession( pMac );
@@ -9828,7 +9834,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                 {
                     pRoamInfo->u.pConnectedProfile = &pSession->connectedProfile;
                 }
-                csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0, 
+                csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0,
                             eCSR_ROAM_CONNECT_STATUS_UPDATE, eCSR_ROAM_RESULT_IBSS_NEW_PEER);
                 if(pRoamInfo)
                 {
@@ -9851,7 +9857,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
                 {
                     vos_log_ibss_pkt_type *pIbssLog;
- 
+
                     WLAN_VOS_DIAG_LOG_ALLOC(pIbssLog, vos_log_ibss_pkt_type, LOG_WLAN_IBSS_C);
                     if(pIbssLog)
                     {
@@ -9871,7 +9877,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                 roamInfo.bcastSig = (tANI_U8)pIbssPeerInd->bcastSig;
                 vos_mem_copy(&roamInfo.peerMac, pIbssPeerInd->peerAddr,
                              sizeof(tCsrBssid));
-                csrRoamCallCallback(pMac, sessionId, &roamInfo, 0, 
+                csrRoamCallCallback(pMac, sessionId, &roamInfo, 0,
                         eCSR_ROAM_CONNECT_STATUS_UPDATE, eCSR_ROAM_RESULT_IBSS_PEER_DEPARTED);
             }
             break;
@@ -9880,14 +9886,14 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                 tSirSmeSetContextRsp *pRsp = (tSirSmeSetContextRsp *)pSirMsg;
                 tListElem *pEntry;
                 tSmeCmd *pCommand;
-                
+
                 pEntry = csrLLPeekHead( &pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK );
                 if ( pEntry )
                 {
                     pCommand = GET_BASE_ADDR( pEntry, tSmeCmd, Link );
                     if ( eSmeCommandSetKey == pCommand->command )
-                    {                
-                        sessionId = pCommand->sessionId;        
+                    {
+                        sessionId = pCommand->sessionId;
                         pSession = CSR_GET_SESSION( pMac, sessionId );
 
                         if(!pSession)
@@ -9895,7 +9901,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                             smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
                             return;
                         }
-       
+
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
                         if(eCSR_ENCRYPT_TYPE_NONE != pSession->connectedProfile.EncryptionType)
                         {
@@ -9910,13 +9916,13 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                             {
                                 setKeyEvent.eventId = WLAN_SECURITY_EVENT_SET_PTK_RSP;
                             }
-                            setKeyEvent.encryptionModeMulticast = 
+                            setKeyEvent.encryptionModeMulticast =
                                 (v_U8_t)diagEncTypeFromCSRType(pSession->connectedProfile.mcEncryptionType);
-                            setKeyEvent.encryptionModeUnicast = 
+                            setKeyEvent.encryptionModeUnicast =
                                 (v_U8_t)diagEncTypeFromCSRType(pSession->connectedProfile.EncryptionType);
                             vos_mem_copy(setKeyEvent.bssid,
                                          pSession->connectedProfile.bssid, 6);
-                            setKeyEvent.authMode = 
+                            setKeyEvent.authMode =
                                 (v_U8_t)diagAuthTypeFromCSRType(pSession->connectedProfile.AuthType);
                             if( eSIR_SME_SUCCESS != pRsp->statusCode )
                             {
@@ -9931,9 +9937,9 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
 
                             //We are done with authentication, whethere succeed or not
                             csrRoamSubstateChange( pMac, eCSR_ROAM_SUBSTATE_NONE, sessionId);
-                            //We do it here because this linkup function is not called after association 
-                            //when a key needs to be set. 
-                            if( csrIsConnStateConnectedInfra(pMac, sessionId) ) 
+                            //We do it here because this linkup function is not called after association
+                            //when a key needs to be set.
+                            if( csrIsConnStateConnectedInfra(pMac, sessionId) )
                             {
                                 csrRoamLinkUp(pMac, pSession->connectedProfile.bssid);
                             }
@@ -9955,7 +9961,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                                        pMsg->messageType = pal_cpu_to_be16((tANI_U16)eWNI_SME_SET_BCN_FILTER_REQ);
                                        pMsg->length = pal_cpu_to_be16(sizeof( tANI_U8));
                                        pMsg->seesionId = sessionId;
-                                       status = palSendMBMessage(pMac->hHdd, pMsg ); 
+                                       status = palSendMBMessage(pMac->hHdd, pMsg );
                                     }
 #endif
                                        result = eCSR_ROAM_RESULT_AUTHENTICATED;
@@ -9973,7 +9979,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                                    "command failed(%d) PeerMac "MAC_ADDRESS_STR,
                                    pRsp->statusCode, MAC_ADDR_ARRAY(pRsp->peerMacAddr));
                         }
-                        csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.setKeyCmd.roamId, 
+                        csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.setKeyCmd.roamId,
                                             eCSR_ROAM_SET_KEY_COMPLETE, result);
                         // Indicate SME_QOS that the SET_KEY is completed, so that SME_QOS
                         // can go ahead and initiate the TSPEC if any are pending
@@ -9981,7 +9987,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
 #ifdef FEATURE_WLAN_CCX
                         //Send Adjacent AP repot to new AP.
                         if (result == eCSR_ROAM_RESULT_AUTHENTICATED &&
-                            pSession->isPrevApInfoValid && 
+                            pSession->isPrevApInfoValid &&
                             pSession->connectedProfile.isCCXAssoc)
                         {
 #ifdef FEATURE_WLAN_CCX_UPLOAD
@@ -10014,13 +10020,13 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                 tSirSmeRemoveKeyRsp *pRsp = (tSirSmeRemoveKeyRsp *)pSirMsg;
                 tListElem *pEntry;
                 tSmeCmd *pCommand;
-                
+
                 pEntry = csrLLPeekHead( &pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK );
                 if ( pEntry )
                 {
                     pCommand = GET_BASE_ADDR( pEntry, tSmeCmd, Link );
                     if ( eSmeCommandRemoveKey == pCommand->command )
-                    {                
+                    {
                         sessionId = pCommand->sessionId;
                         pSession = CSR_GET_SESSION( pMac, sessionId );
 
@@ -10035,13 +10041,13 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                             vos_mem_set(&removeKeyEvent,
                                         sizeof(vos_event_wlan_security_payload_type), 0);
                             removeKeyEvent.eventId = WLAN_SECURITY_EVENT_REMOVE_KEY_RSP;
-                            removeKeyEvent.encryptionModeMulticast = 
+                            removeKeyEvent.encryptionModeMulticast =
                                 (v_U8_t)diagEncTypeFromCSRType(pSession->connectedProfile.mcEncryptionType);
-                            removeKeyEvent.encryptionModeUnicast = 
+                            removeKeyEvent.encryptionModeUnicast =
                                 (v_U8_t)diagEncTypeFromCSRType(pSession->connectedProfile.EncryptionType);
                             vos_mem_copy( removeKeyEvent.bssid,
                                           pSession->connectedProfile.bssid, 6);
-                            removeKeyEvent.authMode = 
+                            removeKeyEvent.authMode =
                                 (v_U8_t)diagAuthTypeFromCSRType(pSession->connectedProfile.AuthType);
                             if( eSIR_SME_SUCCESS != pRsp->statusCode )
                             {
@@ -10061,7 +10067,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
                         {
                             result = eCSR_ROAM_RESULT_FAILURE;
                         }
-                        csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.setKeyCmd.roamId, 
+                        csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.setKeyCmd.roamId,
                                             eCSR_ROAM_REMOVE_KEY_COMPLETE, result);
                         if( csrLLRemoveEntry( &pMac->sme.smeCmdActiveList, pEntry, LL_ACCESS_LOCK ) )
                         {
@@ -10118,10 +10124,10 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
             roamInfo.sessionId = sessionId;
             vos_mem_copy(&roamInfo.peerMac, pSmeMaxAssocInd->peerMac,
                          sizeof(tCsrBssid));
-            csrRoamCallCallback(pMac, sessionId, &roamInfo, 0, 
+            csrRoamCallCallback(pMac, sessionId, &roamInfo, 0,
                     eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED);
             break;
-            
+
         case eWNI_SME_BTAMP_LOG_LINK_IND:
             smsLog( pMac, LOG1, FL("Establish logical link req from HCI serialized through MC thread"));
             btampEstablishLogLinkHdlr( pSirMsg );
@@ -10146,7 +10152,7 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
     }  // end switch on message type
 }
 
-void csrCallRoamingCompletionCallback(tpAniSirGlobal pMac, tCsrRoamSession *pSession, 
+void csrCallRoamingCompletionCallback(tpAniSirGlobal pMac, tCsrRoamSession *pSession,
                                       tCsrRoamInfo *pRoamInfo, tANI_U32 roamId, eCsrRoamResult roamResult)
 {
    if(pSession)
@@ -10161,8 +10167,8 @@ void csrCallRoamingCompletionCallback(tpAniSirGlobal pMac, tCsrRoamSession *pSes
              return;
          }
          //Need to call association_completion because there is an assoc_start pending.
-         csrRoamCallCallback(pMac, pSession->sessionId, NULL, roamId, 
-                                               eCSR_ROAM_ASSOCIATION_COMPLETION, 
+         csrRoamCallCallback(pMac, pSession->sessionId, NULL, roamId,
+                                               eCSR_ROAM_ASSOCIATION_COMPLETION,
                                                eCSR_ROAM_RESULT_FAILURE);
       }
       csrRoamCallCallback(pMac, pSession->sessionId, pRoamInfo, roamId, eCSR_ROAM_ROAMING_COMPLETION, roamResult);
@@ -10177,7 +10183,7 @@ void csrCallRoamingCompletionCallback(tpAniSirGlobal pMac, tCsrRoamSession *pSes
 eHalStatus csrRoamStartRoaming(tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamingReason roamingReason)
 {
     eHalStatus status = eHAL_STATUS_FAILURE;
-    if(CSR_IS_LOSTLINK_ROAMING(roamingReason) && 
+    if(CSR_IS_LOSTLINK_ROAMING(roamingReason) &&
         (eANI_BOOLEAN_FALSE == pMac->roam.roamSession[sessionId].fCancelRoaming))
     {
         status = csrScanRequestLostLink1( pMac, sessionId );
@@ -10186,7 +10192,7 @@ eHalStatus csrRoamStartRoaming(tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoam
 }
 
 //return a boolean to indicate whether roaming completed or continue.
-tANI_BOOLEAN csrRoamCompleteRoaming(tpAniSirGlobal pMac, tANI_U32 sessionId, 
+tANI_BOOLEAN csrRoamCompleteRoaming(tpAniSirGlobal pMac, tANI_U32 sessionId,
                                     tANI_BOOLEAN fForce, eCsrRoamResult roamResult)
 {
     tANI_BOOLEAN fCompleted = eANI_BOOLEAN_TRUE;
@@ -10199,7 +10205,7 @@ tANI_BOOLEAN csrRoamCompleteRoaming(tpAniSirGlobal pMac, tANI_U32 sessionId,
         return eANI_BOOLEAN_FALSE;
     }
     //Check whether time is up
-    if(pSession->fCancelRoaming || fForce || 
+    if(pSession->fCancelRoaming || fForce ||
        ((curTime - pSession->roamingStartTime) > roamTime) ||
        eCsrReassocRoaming == pSession->roamingReason ||
        eCsrDynamicRoaming == pSession->roamingReason)
@@ -10256,7 +10262,7 @@ void csrRoamCancelRoaming(tpAniSirGlobal pMac, tANI_U32 sessionId)
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return;
     }
-    
+
     if(CSR_IS_ROAMING(pSession))
     {
         smsLog(pMac, LOGW, "   Cancelling roaming");
@@ -10267,9 +10273,9 @@ void csrRoamCancelRoaming(tpAniSirGlobal pMac, tANI_U32 sessionId)
         }
         else
         {
-            eCsrRoamResult roamResult = CSR_IS_LOSTLINK_ROAMING(pSession->roamingReason) ? 
+            eCsrRoamResult roamResult = CSR_IS_LOSTLINK_ROAMING(pSession->roamingReason) ?
                                                     eCSR_ROAM_RESULT_LOSTLINK : eCSR_ROAM_RESULT_NONE;
-            //Roaming is stopped after here 
+            //Roaming is stopped after here
             csrRoamCompleteRoaming(pMac, sessionId, eANI_BOOLEAN_TRUE, roamResult);
             //Since CSR may be in lostlink roaming situation, abort all roaming related activities
             csrScanAbortMacScan(pMac, sessionId);
@@ -10290,8 +10296,8 @@ void csrRoamRoamingTimerHandler(void *pv)
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return;
     }
-    
-    if(eANI_BOOLEAN_FALSE == pSession->fCancelRoaming) 
+
+    if(eANI_BOOLEAN_FALSE == pSession->fCancelRoaming)
     {
         if(!HAL_STATUS_SUCCESS(csrRoamStartRoaming(pMac, sessionId, pSession->roamingReason)))
         {
@@ -10311,11 +10317,11 @@ eHalStatus csrRoamStartRoamingTimer(tpAniSirGlobal pMac, tANI_U32 sessionId, tAN
         smsLog(pMac, LOGE, FL("  session %d not found"), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     smsLog(pMac, LOG1, " csrScanStartRoamingTimer");
     pSession->roamingTimerInfo.sessionId = (tANI_U8)sessionId;
     status = vos_timer_start(&pSession->hTimerRoaming, interval/PAL_TIMER_TO_MS_UNIT);
-    
+
     return (status);
 }
 
@@ -10340,9 +10346,9 @@ void csrRoamWaitForKeyTimeOutHandler(void *pv)
 #ifdef FEATURE_WLAN_LFR
         if (csrNeighborRoamIsHandoffInProgress(pMac))
         {
-            /* 
+            /*
              * Enable heartbeat timer when hand-off is in progress
-             * and Key Wait timer expired. 
+             * and Key Wait timer expired.
              */
             smsLog(pMac, LOG2, "Enabling HB timer after WaitKey expiry"
                     " (nHBCount=%d)",
@@ -10363,7 +10369,7 @@ void csrRoamWaitForKeyTimeOutHandler(void *pv)
 
         if (pSession)
         {
-            if( csrIsConnStateConnectedInfra(pMac, pInfo->sessionId) ) 
+            if( csrIsConnStateConnectedInfra(pMac, pInfo->sessionId) )
             {
                 csrRoamLinkUp(pMac, pSession->connectedProfile.bssid);
                 smeProcessPendingQueue(pMac);
@@ -10394,7 +10400,7 @@ void csrRoamWaitForKeyTimeOutHandler(void *pv)
             smsLog(pMac, LOGW, "%s: session not found", __func__);
         }
     }
-    
+
 }
 
 eHalStatus csrRoamStartWaitForKeyTimer(tpAniSirGlobal pMac, tANI_U32 interval)
@@ -10413,7 +10419,7 @@ eHalStatus csrRoamStartWaitForKeyTimer(tpAniSirGlobal pMac, tANI_U32 interval)
 #endif
     smsLog(pMac, LOG1, " csrScanStartWaitForKeyTimer");
     status = vos_timer_start(&pMac->roam.hTimerWaitForKey, interval/PAL_TIMER_TO_MS_UNIT);
-    
+
     return (status);
 }
 
@@ -10425,9 +10431,9 @@ eHalStatus csrRoamStopWaitForKeyTimer(tpAniSirGlobal pMac)
 #ifdef FEATURE_WLAN_LFR
     if (csrNeighborRoamIsHandoffInProgress(pMac))
     {
-        /* 
+        /*
          * Enable heartbeat timer when hand-off is in progress
-         * and Key Wait timer got stopped for some reason 
+         * and Key Wait timer got stopped for some reason
          */
         smsLog(pMac, LOG2, "Enabling HB timer after WaitKey stop"
                 " (nHBCount=%d)",
@@ -10440,7 +10446,7 @@ eHalStatus csrRoamStopWaitForKeyTimer(tpAniSirGlobal pMac)
     return (vos_timer_stop(&pMac->roam.hTimerWaitForKey));
 }
 
-void csrRoamCompletion(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamInfo *pRoamInfo, tSmeCmd *pCommand, 
+void csrRoamCompletion(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamInfo *pRoamInfo, tSmeCmd *pCommand,
                         eCsrRoamResult roamResult, tANI_BOOLEAN fSuccess)
 {
     eRoamCmdStatus roamStatus = csrGetRoamCompleteStatus(pMac, sessionId);
@@ -10452,7 +10458,7 @@ void csrRoamCompletion(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamInfo *pR
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return;
     }
-    
+
     if(pCommand)
     {
         roamId = pCommand->u.roamCmd.roamId;
@@ -10524,13 +10530,13 @@ eHalStatus csrRoamLostLink( tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U32 ty
         result = eCSR_ROAM_RESULT_NONE;
         pSession->joinFailStatusCode.reasonCode = 1;
     }
-    
+
     // call profile lost link routine here
     if(!CSR_IS_INFRA_AP(&pSession->connectedProfile))
     {
         csrRoamCallCallback(pMac, sessionId, NULL, 0, eCSR_ROAM_LOSTLINK_DETECTED, result);
     }
-    
+
     if ( eWNI_SME_DISASSOC_IND == type )
     {
         status = csrSendMBDisassocCnfMsg(pMac, pDisassocIndMsg);
@@ -10576,7 +10582,7 @@ eHalStatus csrRoamLostLink( tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U32 ty
         if( pMac->roam.configParam.nRoamingTime )
         {
             if(HAL_STATUS_SUCCESS(status = csrRoamStartRoaming(pMac, sessionId,
-                        ( eWNI_SME_DEAUTH_IND == type ) ? 
+                        ( eWNI_SME_DEAUTH_IND == type ) ?
                         eCsrLostlinkRoamingDeauth : eCsrLostlinkRoamingDisassoc)))
             {
                 vos_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0);
@@ -10592,7 +10598,7 @@ eHalStatus csrRoamLostLink( tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U32 ty
                    roamInfo.reasonCode = eCsrRoamReasonSmeIssuedForLostLink;
                 }
                     pRoamInfo = &roamInfo;
-                pSession->roamingReason = ( eWNI_SME_DEAUTH_IND == type ) ? 
+                pSession->roamingReason = ( eWNI_SME_DEAUTH_IND == type ) ?
                         eCsrLostlinkRoamingDeauth : eCsrLostlinkRoamingDisassoc;
                 pSession->roamingStartTime = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
                 csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0, eCSR_ROAM_ROAMING_START, eCSR_ROAM_RESULT_LOSTLINK);
@@ -10621,14 +10627,14 @@ eHalStatus csrRoamLostLink( tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U32 ty
             csrRoamCallCallback(pMac, sessionId, &roamInfo, 0, eCSR_ROAM_LOSTLINK, result);
         }
 
-       /*No need to start idle scan in case of IBSS/SAP 
+       /*No need to start idle scan in case of IBSS/SAP
          Still enable idle scan for polling in case concurrent sessions are running */
         if(CSR_IS_INFRASTRUCTURE(&pSession->connectedProfile))
         {
             csrScanStartIdleScan(pMac);
         }
     }
-    
+
     return (status);
 }
 
@@ -10644,7 +10650,7 @@ eHalStatus csrRoamLostLinkAfterhandoffFailure( tpAniSirGlobal pMac,tANI_U32 sess
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     pSession->fCancelRoaming =  eANI_BOOLEAN_FALSE;
     //Only remove the connected BSS in infrastructure mode
     csrRoamRemoveConnectedBssFromScanCache(pMac, &pSession->connectedProfile);
@@ -10677,7 +10683,7 @@ eHalStatus csrRoamLostLinkAfterhandoffFailure( tpAniSirGlobal pMac,tANI_U32 sess
        //We are told not to roam, indicate lostlink
        status = eHAL_STATUS_FAILURE;
     }
-    
+
     return (status);
 }
 void csrRoamWmStatusChangeComplete( tpAniSirGlobal pMac )
@@ -10694,13 +10700,13 @@ void csrRoamWmStatusChangeComplete( tpAniSirGlobal pMac )
             // roaming sequence.
             if( csrLLRemoveEntry( &pMac->sme.smeCmdActiveList, pEntry, LL_ACCESS_LOCK ) )
             {
-                csrReleaseCommandWmStatusChange( pMac, pCommand );            
+                csrReleaseCommandWmStatusChange( pMac, pCommand );
             }
             else
             {
                 smsLog( pMac, LOGE, " ******csrRoamWmStatusChangeComplete fail to release command");
             }
-            
+
         }
         else
         {
@@ -10725,7 +10731,7 @@ void csrRoamProcessWmStatusChangeCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand
         smsLog(pMac, LOGE, FL("  session %d not found "), pCommand->sessionId);
         return;
     }
-    
+
     switch ( pCommand->u.wmStatusChangeCmd.Type )
     {
         case eCsrDisassociated:
@@ -10757,16 +10763,16 @@ void csrRoamProcessWmStatusChangeCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand
 //This function returns band and mode information.
 //The only tricky part is that if phyMode is set to 11abg, this function may return eCSR_CFG_DOT11_MODE_11B
 //instead of eCSR_CFG_DOT11_MODE_11G if everything is set to auto-pick.
-static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, 
+static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile,
                                                      tANI_U8 operationChn, eCsrBand *pBand )
 {
     eCsrPhyMode phyModeIn = (eCsrPhyMode)pProfile->phyMode;
-    eCsrCfgDot11Mode cfgDot11Mode = csrGetCfgDot11ModeFromCsrPhyMode(pProfile, phyModeIn, 
+    eCsrCfgDot11Mode cfgDot11Mode = csrGetCfgDot11ModeFromCsrPhyMode(pProfile, phyModeIn,
                                             pMac->roam.configParam.ProprietaryRatesEnabled);
     eCsrBand eBand;
-    
+
     //If the global setting for dot11Mode is set to auto/abg, we overwrite the setting in the profile.
-    if( ((!CSR_IS_INFRA_AP(pProfile )&& !CSR_IS_WDS(pProfile )) && 
+    if( ((!CSR_IS_INFRA_AP(pProfile )&& !CSR_IS_WDS(pProfile )) &&
          ((eCSR_CFG_DOT11_MODE_AUTO == pMac->roam.configParam.uCfgDot11Mode) ||
          (eCSR_CFG_DOT11_MODE_ABG == pMac->roam.configParam.uCfgDot11Mode))) ||
         (eCSR_CFG_DOT11_MODE_AUTO == cfgDot11Mode) || (eCSR_CFG_DOT11_MODE_ABG == cfgDot11Mode) )
@@ -10784,7 +10790,7 @@ static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, tCsrRo
             case eCSR_CFG_DOT11_MODE_11G:
                 cfgDot11Mode = eCSR_CFG_DOT11_MODE_11G;
                 eBand = eCSR_BAND_24;
-                break;            
+                break;
             case eCSR_CFG_DOT11_MODE_11N:
                 cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N;
                 eBand = CSR_IS_CHANNEL_24GHZ(operationChn) ? eCSR_BAND_24 : eCSR_BAND_5G;
@@ -10927,8 +10933,8 @@ static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, tCsrRo
                     cfgDot11Mode = eCSR_CFG_DOT11_MODE_11B;
                     eBand = eCSR_BAND_24;
                 }
-                else 
-                {   
+                else
+                {
                     // else, it's a 5.0GHz channel.  Set mode to 11a.
                     cfgDot11Mode = eCSR_CFG_DOT11_MODE_11A;
                     eBand = eCSR_BAND_5G;
@@ -10941,7 +10947,7 @@ static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, tCsrRo
             //dot11 mode is set, lets pick the band
             if ( eCSR_OPERATING_CHANNEL_AUTO == operationChn )
             {
-                // channel is Auto also. 
+                // channel is Auto also.
                 eBand = pMac->roam.configParam.eBand;
                 if(eCSR_BAND_ALL == eBand)
                 {
@@ -10953,8 +10959,8 @@ static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, tCsrRo
             {
                 eBand = eCSR_BAND_24;
             }
-            else 
-            {   
+            else
+            {
                 eBand = eCSR_BAND_5G;
             }
     }
@@ -10962,8 +10968,8 @@ static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, tCsrRo
     {
         *pBand = eBand;
     }
-    
-   if (operationChn == 14){ 
+
+   if (operationChn == 14){
      smsLog(pMac, LOGE, FL("  Switching to Dot11B mode "));
      cfgDot11Mode = eCSR_CFG_DOT11_MODE_11B;
    }
@@ -10999,7 +11005,7 @@ eHalStatus csrRoamIssueStopBss( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoa
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
     {
         vos_log_ibss_pkt_type *pIbssLog;
@@ -11026,7 +11032,7 @@ eHalStatus csrRoamIssueStopBss( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoa
 //pNumChan is a caller allocated space with the sizeof pChannels
 eHalStatus csrGetCfgValidChannels(tpAniSirGlobal pMac, tANI_U8 *pChannels, tANI_U32 *pNumChan)
 {
-   
+
     return (ccmCfgGetStr(pMac, WNI_CFG_VALID_CHANNEL_LIST,
                   (tANI_U8 *)pChannels,
                   pNumChan));
@@ -11100,7 +11106,7 @@ tANI_BOOLEAN csrRoamIsChannelValid( tpAniSirGlobal pMac, tANI_U8 channel )
     tANI_BOOLEAN fValid = FALSE;
     tANI_U32 idxValidChannels;
     tANI_U32 len = sizeof(pMac->roam.validChannelList);
-    
+
     if (HAL_STATUS_SUCCESS(csrGetCfgValidChannels(pMac, pMac->roam.validChannelList, &len)))
     {
         for ( idxValidChannels = 0; ( idxValidChannels < len ); idxValidChannels++ )
@@ -11111,8 +11117,8 @@ tANI_BOOLEAN csrRoamIsChannelValid( tpAniSirGlobal pMac, tANI_U8 channel )
                 break;
             }
         }
-    }    
-    pMac->roam.numValidChannels = len;   
+    }
+    pMac->roam.numValidChannels = len;
     return fValid;
 }
 
@@ -11152,7 +11158,7 @@ tANI_BOOLEAN csrRoamIsValid40MhzChannel(tpAniSirGlobal pMac, tANI_U8 channel)
         {
             if(pIes->HTInfo.present)
             {
-                /* This is called during INFRA STA/CLIENT and should use the merged value of 
+                /* This is called during INFRA STA/CLIENT and should use the merged value of
                  * supported channel width and recommended tx width as per standard
                  */
                 smsLog(pMac, LOG1, "scws %u rtws %u sco %u",
@@ -11219,7 +11225,7 @@ tANI_BOOLEAN csrIsSameProfile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pPr
     tANI_BOOLEAN fCheck = eANI_BOOLEAN_FALSE;
     tCsrScanResultFilter *pScanFilter = NULL;
     eHalStatus status = eHAL_STATUS_SUCCESS;
-    
+
     if(pProfile1 && pProfile2)
     {
         pScanFilter = vos_mem_malloc(sizeof(tCsrScanResultFilter));
@@ -11239,7 +11245,7 @@ tANI_BOOLEAN csrIsSameProfile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pPr
                     tANI_U32 i;
                     for(i = 0; i < pScanFilter->SSIDs.numOfSSIDs; i++)
                     {
-                        fCheck = csrIsSsidMatch( pMac, pScanFilter->SSIDs.SSIDList[i].SSID.ssId, 
+                        fCheck = csrIsSsidMatch( pMac, pScanFilter->SSIDs.SSIDList[i].SSID.ssId,
                                                 pScanFilter->SSIDs.SSIDList[i].SSID.length,
                                                 pProfile1->SSID.ssId, pProfile1->SSID.length, eANI_BOOLEAN_FALSE );
                         if ( fCheck ) break;
@@ -11274,7 +11280,7 @@ tANI_BOOLEAN csrIsSameProfile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pPr
            vos_mem_free(pScanFilter);
         }
     }
-    
+
     return (fCheck);
 }
 
@@ -11314,12 +11320,12 @@ tANI_BOOLEAN csrRoamIsSameProfileKeys(tpAniSirGlobal pMac, tCsrRoamConnectedProf
 
 tANI_U8 csrRoamGetIbssStartChannelNumber50( tpAniSirGlobal pMac )
 {
-    tANI_U8 channel = 0;     
+    tANI_U8 channel = 0;
     tANI_U32 idx;
     tANI_U32 idxValidChannels;
     tANI_BOOLEAN fFound = FALSE;
     tANI_U32 len = sizeof(pMac->roam.validChannelList);
-    
+
     if(eCSR_OPERATING_CHANNEL_ANY != pMac->roam.configParam.AdHocChannel5G)
     {
         channel = pMac->roam.configParam.AdHocChannel5G;
@@ -11330,7 +11336,7 @@ tANI_U8 csrRoamGetIbssStartChannelNumber50( tpAniSirGlobal pMac )
     }
     if (0 == channel && HAL_STATUS_SUCCESS(csrGetCfgValidChannels(pMac, (tANI_U8 *)pMac->roam.validChannelList, &len)))
     {
-        for ( idx = 0; ( idx < CSR_NUM_IBSS_START_CHANNELS_50 ) && !fFound; idx++ ) 
+        for ( idx = 0; ( idx < CSR_NUM_IBSS_START_CHANNELS_50 ) && !fFound; idx++ )
         {
             for ( idxValidChannels = 0; ( idxValidChannels < len ) && !fFound; idxValidChannels++ )
             {
@@ -11342,7 +11348,7 @@ tANI_U8 csrRoamGetIbssStartChannelNumber50( tpAniSirGlobal pMac )
             }
         }
         // this is rare, but if it does happen, we find anyone in 11a bandwidth and return the first 11a channel found!
-        if (!fFound)    
+        if (!fFound)
         {
             for ( idxValidChannels = 0; idxValidChannels < len ; idxValidChannels++ )
             {
@@ -11357,8 +11363,8 @@ tANI_U8 csrRoamGetIbssStartChannelNumber50( tpAniSirGlobal pMac )
             }
         }
     }//if
-    
-    return( channel );    
+
+    return( channel );
 }
 
 tANI_U8 csrRoamGetIbssStartChannelNumber24( tpAniSirGlobal pMac )
@@ -11368,7 +11374,7 @@ tANI_U8 csrRoamGetIbssStartChannelNumber24( tpAniSirGlobal pMac )
     tANI_U32 idxValidChannels;
     tANI_BOOLEAN fFound = FALSE;
     tANI_U32 len = sizeof(pMac->roam.validChannelList);
-    
+
     if(eCSR_OPERATING_CHANNEL_ANY != pMac->roam.configParam.AdHocChannel24)
     {
         channel = pMac->roam.configParam.AdHocChannel24;
@@ -11377,10 +11383,10 @@ tANI_U8 csrRoamGetIbssStartChannelNumber24( tpAniSirGlobal pMac )
             channel = 0;
         }
     }
-    
+
     if (0 == channel && HAL_STATUS_SUCCESS(csrGetCfgValidChannels(pMac, (tANI_U8 *)pMac->roam.validChannelList, &len)))
     {
-        for ( idx = 0; ( idx < CSR_NUM_IBSS_START_CHANNELS_24 ) && !fFound; idx++ ) 
+        for ( idx = 0; ( idx < CSR_NUM_IBSS_START_CHANNELS_24 ) && !fFound; idx++ )
         {
             for ( idxValidChannels = 0; ( idxValidChannels < len ) && !fFound; idxValidChannels++ )
             {
@@ -11392,33 +11398,33 @@ tANI_U8 csrRoamGetIbssStartChannelNumber24( tpAniSirGlobal pMac )
             }
         }
     }
-    
-    return( channel );    
+
+    return( channel );
 }
 
-static void csrRoamGetBssStartParms( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, 
+static void csrRoamGetBssStartParms( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile,
                                       tCsrRoamStartBssParams *pParam )
 {
     eCsrCfgDot11Mode cfgDot11Mode;
     eCsrBand eBand;
     tANI_U8 channel = 0;
     tSirNwType nwType;
-    tANI_U8 operationChannel = 0; 
-    
+    tANI_U8 operationChannel = 0;
+
     if(pProfile->ChannelInfo.numOfChannels && pProfile->ChannelInfo.ChannelList)
     {
        operationChannel = pProfile->ChannelInfo.ChannelList[0];
     }
-    
+
     cfgDot11Mode = csrRoamGetPhyModeBandForBss( pMac, pProfile, operationChannel, &eBand );
-    
+
     if( ( (pProfile->csrPersona == VOS_P2P_CLIENT_MODE) ||
           (pProfile->csrPersona == VOS_P2P_GO_MODE) )
      && ( cfgDot11Mode == eCSR_CFG_DOT11_MODE_11B)
       )
     {
         /* This should never happen */
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL, 
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
               FL("For P2PClient/P2P-GO (persona %d) cfgDot11Mode is 11B"),
               pProfile->csrPersona);
         VOS_ASSERT(0);
@@ -11430,7 +11436,7 @@ static void csrRoamGetBssStartParms( tpAniSirGlobal pMac, tCsrRoamProfile *pProf
             break;
         case eCSR_CFG_DOT11_MODE_11B:
             nwType = eSIR_11B_NW_TYPE;
-            break;   
+            break;
         case eCSR_CFG_DOT11_MODE_11A:
             nwType = eSIR_11A_NW_TYPE;
             break;
@@ -11447,7 +11453,7 @@ static void csrRoamGetBssStartParms( tpAniSirGlobal pMac, tCsrRoamProfile *pProf
                 nwType = eSIR_11A_NW_TYPE;
             }
             break;
-    }   
+    }
 
     pParam->extendedRateSet.numRates = 0;
 
@@ -11456,9 +11462,9 @@ static void csrRoamGetBssStartParms( tpAniSirGlobal pMac, tCsrRoamProfile *pProf
         default:
             smsLog(pMac, LOGE, FL("sees an unknown pSirNwType (%d)"), nwType);
         case eSIR_11A_NW_TYPE:
-        
+
             pParam->operationalRateSet.numRates = 8;
-        
+
             pParam->operationalRateSet.rate[0] = SIR_MAC_RATE_6 | CSR_DOT11_BASIC_RATE_MASK;
             pParam->operationalRateSet.rate[1] = SIR_MAC_RATE_9;
             pParam->operationalRateSet.rate[2] = SIR_MAC_RATE_12 | CSR_DOT11_BASIC_RATE_MASK;
@@ -11467,13 +11473,13 @@ static void csrRoamGetBssStartParms( tpAniSirGlobal pMac, tCsrRoamProfile *pProf
             pParam->operationalRateSet.rate[5] = SIR_MAC_RATE_36;
             pParam->operationalRateSet.rate[6] = SIR_MAC_RATE_48;
             pParam->operationalRateSet.rate[7] = SIR_MAC_RATE_54;
-            
-            if ( eCSR_OPERATING_CHANNEL_ANY == operationChannel ) 
+
+            if ( eCSR_OPERATING_CHANNEL_ANY == operationChannel )
             {
                 channel = csrRoamGetIbssStartChannelNumber50( pMac );
                 if( 0 == channel &&
-                    CSR_IS_PHY_MODE_DUAL_BAND(pProfile->phyMode) && 
-                    CSR_IS_PHY_MODE_DUAL_BAND(pMac->roam.configParam.phyMode) 
+                    CSR_IS_PHY_MODE_DUAL_BAND(pProfile->phyMode) &&
+                    CSR_IS_PHY_MODE_DUAL_BAND(pMac->roam.configParam.phyMode)
                     )
                 {
                     //We could not find a 5G channel by auto pick, let's try 2.4G channels
@@ -11487,36 +11493,36 @@ static void csrRoamGetBssStartParms( tpAniSirGlobal pMac, tCsrRoamProfile *pProf
                    pParam->operationalRateSet.rate[3] = SIR_MAC_RATE_11 | CSR_DOT11_BASIC_RATE_MASK;
                 }
             }
-            else 
+            else
             {
                 channel = operationChannel;
             }
             break;
-            
+
         case eSIR_11B_NW_TYPE:
             pParam->operationalRateSet.numRates = 4;
             pParam->operationalRateSet.rate[0] = SIR_MAC_RATE_1 | CSR_DOT11_BASIC_RATE_MASK;
             pParam->operationalRateSet.rate[1] = SIR_MAC_RATE_2 | CSR_DOT11_BASIC_RATE_MASK;
             pParam->operationalRateSet.rate[2] = SIR_MAC_RATE_5_5 | CSR_DOT11_BASIC_RATE_MASK;
             pParam->operationalRateSet.rate[3] = SIR_MAC_RATE_11 | CSR_DOT11_BASIC_RATE_MASK;
-            if ( eCSR_OPERATING_CHANNEL_ANY == operationChannel ) 
+            if ( eCSR_OPERATING_CHANNEL_ANY == operationChannel )
             {
                 channel = csrRoamGetIbssStartChannelNumber24( pMac );
             }
-            else 
+            else
             {
                 channel = operationChannel;
             }
-            
-            break;     
+
+            break;
         case eSIR_11G_NW_TYPE:
-            /* For P2P Client and P2P GO, disable 11b rates */ 
+            /* For P2P Client and P2P GO, disable 11b rates */
             if( (pProfile->csrPersona == VOS_P2P_CLIENT_MODE) ||
                 (pProfile->csrPersona == VOS_P2P_GO_MODE)
               )
             {
                 pParam->operationalRateSet.numRates = 8;
-            
+
                 pParam->operationalRateSet.rate[0] = SIR_MAC_RATE_6 | CSR_DOT11_BASIC_RATE_MASK;
                 pParam->operationalRateSet.rate[1] = SIR_MAC_RATE_9;
                 pParam->operationalRateSet.rate[2] = SIR_MAC_RATE_12 | CSR_DOT11_BASIC_RATE_MASK;
@@ -11533,7 +11539,7 @@ static void csrRoamGetBssStartParms( tpAniSirGlobal pMac, tCsrRoamProfile *pProf
             pParam->operationalRateSet.rate[1] = SIR_MAC_RATE_2 | CSR_DOT11_BASIC_RATE_MASK;
             pParam->operationalRateSet.rate[2] = SIR_MAC_RATE_5_5 | CSR_DOT11_BASIC_RATE_MASK;
             pParam->operationalRateSet.rate[3] = SIR_MAC_RATE_11 | CSR_DOT11_BASIC_RATE_MASK;
-               
+
             pParam->extendedRateSet.numRates = 8;
                         pParam->extendedRateSet.rate[0] = SIR_MAC_RATE_6;
             pParam->extendedRateSet.rate[1] = SIR_MAC_RATE_9;
@@ -11544,33 +11550,33 @@ static void csrRoamGetBssStartParms( tpAniSirGlobal pMac, tCsrRoamProfile *pProf
             pParam->extendedRateSet.rate[6] = SIR_MAC_RATE_48;
             pParam->extendedRateSet.rate[7] = SIR_MAC_RATE_54;
             }
-            
-            if ( eCSR_OPERATING_CHANNEL_ANY == operationChannel ) 
+
+            if ( eCSR_OPERATING_CHANNEL_ANY == operationChannel )
             {
                 channel = csrRoamGetIbssStartChannelNumber24( pMac );
             }
-            else 
+            else
             {
                 channel = operationChannel;
             }
-            
-            break;            
+
+            break;
     }
     pParam->operationChn = channel;
     pParam->sirNwType = nwType;
 }
 
-static void csrRoamGetBssStartParmsFromBssDesc( tpAniSirGlobal pMac, tSirBssDescription *pBssDesc, 
+static void csrRoamGetBssStartParmsFromBssDesc( tpAniSirGlobal pMac, tSirBssDescription *pBssDesc,
                                                  tDot11fBeaconIEs *pIes, tCsrRoamStartBssParams *pParam )
 {
-    
+
     if( pParam )
     {
         pParam->sirNwType = pBssDesc->nwType;
         pParam->cbMode = PHY_SINGLE_CHANNEL_CENTERED;
         pParam->operationChn = pBssDesc->channelId;
         vos_mem_copy(&pParam->bssid, pBssDesc->bssId, sizeof(tCsrBssid));
-    
+
         if( pIes )
         {
             if(pIes->SuppRates.present)
@@ -11620,22 +11626,22 @@ static void csrRoamDetermineMaxRateForAdHoc( tpAniSirGlobal pMac, tSirMacRateSet
 {
     tANI_U8 MaxRate = 0;
     tANI_U32 i;
-    tANI_U8 *pRate;    
-   
+    tANI_U8 *pRate;
+
     pRate = pSirRateSet->rate;
     for ( i = 0; i < pSirRateSet->numRates; i++ )
     {
         MaxRate = CSR_MAX( MaxRate, ( pRate[ i ] & (~CSR_DOT11_BASIC_RATE_MASK) ) );
     }
-    
+
     // Save the max rate in the connected state information...
-    
+
     // modify LastRates variable as well
-    
+
     return;
 }
 
-eHalStatus csrRoamIssueStartBss( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamStartBssParams *pParam, 
+eHalStatus csrRoamIssueStartBss( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamStartBssParams *pParam,
                                  tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, tANI_U32 roamId )
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -11678,7 +11684,7 @@ eHalStatus csrRoamIssueStartBss( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRo
     pParam->pRSNIE = pProfile->pRSNReqIE;
 
     pParam->privacy           = pProfile->privacy;
-    pParam->fwdWPSPBCProbeReq = pProfile->fwdWPSPBCProbeReq;   
+    pParam->fwdWPSPBCProbeReq = pProfile->fwdWPSPBCProbeReq;
     pParam->authType          = pProfile->csr80211AuthType;
     pParam->beaconInterval    = pProfile->beaconInterval;
     pParam->dtimPeriod        = pProfile->dtimPeriod;
@@ -11688,15 +11694,15 @@ eHalStatus csrRoamIssueStartBss( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRo
     {
         if (csrIsValidChannel(pMac, pParam->operationChn) != eHAL_STATUS_SUCCESS)
         {
-            pParam->operationChn = INFRA_AP_DEFAULT_CHANNEL;                   
-        }  
+            pParam->operationChn = INFRA_AP_DEFAULT_CHANNEL;
+        }
     }
     pParam->protEnabled     = pProfile->protEnabled;
     pParam->obssProtEnabled = pProfile->obssProtEnabled;
     pParam->ht_protection   = pProfile->cfg_protection;
     pParam->wps_state       = pProfile->wps_state;
 
-    pParam->uCfgDot11Mode = csrRoamGetPhyModeBandForBss(pMac, pProfile, pParam->operationChn /* pProfile->operationChannel*/, 
+    pParam->uCfgDot11Mode = csrRoamGetPhyModeBandForBss(pMac, pProfile, pParam->operationChn /* pProfile->operationChannel*/,
                                         &eBand);
     pParam->bssPersona = pProfile->csrPersona;
     // When starting an IBSS, start on the channel from the Profile.
@@ -11704,7 +11710,7 @@ eHalStatus csrRoamIssueStartBss( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRo
     return (status);
 }
 
-static void csrRoamPrepareBssParams(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+static void csrRoamPrepareBssParams(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                                      tSirBssDescription *pBssDesc, tBssConfigParam *pBssConfig, tDot11fBeaconIEs *pIes)
 {
     tANI_U8 Channel;
@@ -11716,7 +11722,7 @@ static void csrRoamPrepareBssParams(tpAniSirGlobal pMac, tANI_U32 sessionId, tCs
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return;
     }
-    
+
     if( pBssDesc )
     {
         csrRoamGetBssStartParmsFromBssDesc( pMac, pBssDesc, pIes, &pSession->bssParams );
@@ -11756,18 +11762,18 @@ static void csrRoamPrepareBssParams(tpAniSirGlobal pMac, tANI_U32 sessionId, tCs
         }
     }
     Channel = pSession->bssParams.operationChn;
-    //Set operating channel in pProfile which will be used 
+    //Set operating channel in pProfile which will be used
     //in csrRoamSetBssConfigCfg() to determine channel bonding
-    //mode and will be configured in CFG later 
+    //mode and will be configured in CFG later
     pProfile->operationChannel = Channel;
-    
+
     if(Channel == 0)
     {
         smsLog(pMac, LOGW, "   CSR cannot find a channel to start IBSS");
     }
     else
     {
-  
+
         csrRoamDetermineMaxRateForAdHoc( pMac, &pSession->bssParams.operationalRateSet );
         if (CSR_IS_INFRA_AP(pProfile) || CSR_IS_START_IBSS( pProfile ) )
         {
@@ -11786,34 +11792,34 @@ static void csrRoamPrepareBssParams(tpAniSirGlobal pMac, tANI_U32 sessionId, tCs
     }
 }
 
-static eHalStatus csrRoamStartIbss( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+static eHalStatus csrRoamStartIbss( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                                     tANI_BOOLEAN *pfSameIbss )
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tANI_BOOLEAN fSameIbss = FALSE;
-     
-    if ( csrIsConnStateIbss( pMac, sessionId ) ) 
-    { 
+
+    if ( csrIsConnStateIbss( pMac, sessionId ) )
+    {
         // Check if any profile parameter has changed ? If any profile parameter
         // has changed then stop old BSS and start a new one with new parameters
-        if ( csrIsSameProfile( pMac, &pMac->roam.roamSession[sessionId].connectedProfile, pProfile ) ) 
+        if ( csrIsSameProfile( pMac, &pMac->roam.roamSession[sessionId].connectedProfile, pProfile ) )
         {
             fSameIbss = TRUE;
         }
         else
         {
             status = csrRoamIssueStopBss( pMac, sessionId, eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING );
-        }       
+        }
     }
-    else if ( csrIsConnStateConnectedInfra( pMac, sessionId ) ) 
+    else if ( csrIsConnStateConnectedInfra( pMac, sessionId ) )
     {
         // Disassociate from the connected Infrastructure network...
         status = csrRoamIssueDisassociate( pMac, sessionId, eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING, FALSE );
     }
-    else 
+    else
     {
         tBssConfigParam *pBssConfig;
-        
+
         pBssConfig = vos_mem_malloc(sizeof(tBssConfigParam));
         if ( NULL == pBssConfig )
            status = eHAL_STATUS_FAILURE;
@@ -11839,7 +11845,7 @@ static eHalStatus csrRoamStartIbss( tpAniSirGlobal pMac, tANI_U32 sessionId, tCs
             vos_mem_free(pBssConfig);
         }//Allocate memory
     }
-    
+
     if(pfSameIbss)
     {
         *pfSameIbss = fSameIbss;
@@ -11847,7 +11853,7 @@ static eHalStatus csrRoamStartIbss( tpAniSirGlobal pMac, tANI_U32 sessionId, tCs
     return( status );
 }
 
-static void csrRoamUpdateConnectedProfileFromNewBss( tpAniSirGlobal pMac, tANI_U32 sessionId, 
+static void csrRoamUpdateConnectedProfileFromNewBss( tpAniSirGlobal pMac, tANI_U32 sessionId,
                                                      tSirSmeNewBssInfo *pNewBss )
 {
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
@@ -11857,7 +11863,7 @@ static void csrRoamUpdateConnectedProfileFromNewBss( tpAniSirGlobal pMac, tANI_U
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return;
     }
-    
+
     if( pNewBss )
     {
         // Set the operating channel.
@@ -11940,13 +11946,13 @@ eHalStatus csrRoamSetPMKIDCache( tpAniSirGlobal pMac, tANI_U32 sessionId,
 {
     eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
-    
+
     if(!pSession)
     {
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     smsLog(pMac, LOGW, "csrRoamSetPMKIDCache called, numItems = %d", numItems);
     if(numItems <= CSR_MAX_PMKID_ALLOWED)
     {
@@ -11956,12 +11962,12 @@ eHalStatus csrRoamSetPMKIDCache( tpAniSirGlobal pMac, tANI_U32 sessionId,
             vos_mem_set(&secEvent,
                         sizeof(vos_event_wlan_security_payload_type), 0);
             secEvent.eventId = WLAN_SECURITY_EVENT_PMKID_UPDATE;
-            secEvent.encryptionModeMulticast = 
+            secEvent.encryptionModeMulticast =
                 (v_U8_t)diagEncTypeFromCSRType(pSession->connectedProfile.mcEncryptionType);
-            secEvent.encryptionModeUnicast = 
+            secEvent.encryptionModeUnicast =
                 (v_U8_t)diagEncTypeFromCSRType(pSession->connectedProfile.EncryptionType);
             vos_mem_copy(secEvent.bssid, pSession->connectedProfile.bssid, 6);
-            secEvent.authMode = 
+            secEvent.authMode =
                 (v_U8_t)diagAuthTypeFromCSRType(pSession->connectedProfile.AuthType);
             WLAN_VOS_DIAG_EVENT_REPORT(&secEvent, EVENT_WLAN_SECURITY);
         }
@@ -12027,7 +12033,7 @@ eHalStatus csrRoamGetPMKIDCache(tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U3
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     if(pNum && pPmkidCache)
     {
         if(pSession->NumPmkidCache == 0)
@@ -12057,13 +12063,13 @@ eHalStatus csrRoamGetWpaRsnReqIE(tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U
     eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
     tANI_U32 len;
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
-    
+
     if(!pSession)
     {
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     if(pLen)
     {
         len = *pLen;
@@ -12092,7 +12098,7 @@ eHalStatus csrRoamGetWpaRsnRspIE(tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     if(pLen)
     {
         len = *pLen;
@@ -12121,7 +12127,7 @@ eHalStatus csrRoamGetWapiReqIE(tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U32
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     if(pLen)
     {
         len = *pLen;
@@ -12149,7 +12155,7 @@ eHalStatus csrRoamGetWapiRspIE(tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U32
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     if(pLen)
     {
         len = *pLen;
@@ -12177,7 +12183,7 @@ eRoamCmdStatus csrGetRoamCompleteStatus(tpAniSirGlobal pMac, tANI_U32 sessionId)
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return (retStatus);
     }
-    
+
     if(CSR_IS_ROAMING(pSession))
     {
         retStatus = eCSR_ROAM_ROAMING_COMPLETION;
@@ -12245,11 +12251,11 @@ eHalStatus csrRoamRemoveConnectedBssFromScanCache(tpAniSirGlobal pMac,
             pScanFilter->phyMode = eCSR_DOT11_MODE_TAURUS;
             csrLLLock(&pMac->scan.scanResultList);
             pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_NOLOCK );
-            while( pEntry ) 
+            while( pEntry )
             {
                 pResult = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
                                 pIes = (tDot11fBeaconIEs *)( pResult->Result.pvIes );
-                fMatch = csrMatchBSS(pMac, &pResult->Result.BssDescriptor, 
+                fMatch = csrMatchBSS(pMac, &pResult->Result.BssDescriptor,
                                pScanFilter, NULL, NULL, NULL, &pIes);
                 //Release the IEs allocated by csrMatchBSS is needed
                 if( !pResult->Result.pvIes )
@@ -12298,7 +12304,7 @@ eHalStatus csrIsBTAMPAllowed( tpAniSirGlobal pMac, tANI_U32 chnId )
             }
             if( csrIsConnStateInfra( pMac, sessionId ) )
             {
-                if( chnId && 
+                if( chnId &&
                     ( (tANI_U8)chnId != pMac->roam.roamSession[sessionId].connectedProfile.operationChannel ) )
                 {
                     smsLog( pMac, LOGW, " BTAMP is not allowed due to channel (%d) diff than infr channel (%d)",
@@ -12323,21 +12329,21 @@ static eHalStatus csrRoamStartWds( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsr
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
-    if ( csrIsConnStateIbss( pMac, sessionId ) ) 
-    { 
+
+    if ( csrIsConnStateIbss( pMac, sessionId ) )
+    {
         status = csrRoamIssueStopBss( pMac, sessionId, eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING );
     }
-    else if ( csrIsConnStateConnectedInfra( pMac, sessionId ) ) 
+    else if ( csrIsConnStateConnectedInfra( pMac, sessionId ) )
     {
         // Disassociate from the connected Infrastructure network...
         status = csrRoamIssueDisassociate( pMac, sessionId, eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING, FALSE );
     }
     else
     {
-        //We don't expect Bt-AMP HDD not to disconnect the last connection first at this time. 
+        //We don't expect Bt-AMP HDD not to disconnect the last connection first at this time.
         //Otherwise we need to add code to handle the
-        //situation just like IBSS. Though for WDS station, we need to send disassoc to PE first then 
+        //situation just like IBSS. Though for WDS station, we need to send disassoc to PE first then
         //send stop_bss to PE, before we can continue.
 
         if (csrIsConnStateWds( pMac, sessionId ))
@@ -12403,14 +12409,14 @@ static void csrPrepareJoinReassocReqBuffer( tpAniSirGlobal pMac,
     }
     else
         fTmp = (tAniBool)0;
-   
+
     // corresponds to --- pMsg->spectrumMgtIndicator = ON;
     vos_mem_copy(pBuf, (tANI_U8 *)&fTmp, sizeof(tAniBool));
     pBuf += sizeof(tAniBool);
     *pBuf++ = MIN_STA_PWR_CAP_DBM; // it is for pMsg->powerCap.minTxPower = 0;
     found = csrSearchChannelListForTxPower(pMac, pBssDescription, &channelGroup);
     // This is required for 11k test VoWiFi Ent: Test 2.
-    // We need the power capabilities for Assoc Req. 
+    // We need the power capabilities for Assoc Req.
     // This macro is provided by the halPhyCfg.h. We pick our
     // max and min capability by the halPhy provided macros
     pwrLimit = csrGetCfgMaxTxPower (pMac, pBssDescription->channelId);
@@ -12424,19 +12430,19 @@ static void csrPrepareJoinReassocReqBuffer( tpAniSirGlobal pMac,
     }
     size = sizeof(pMac->roam.validChannelList);
     if(HAL_STATUS_SUCCESS(csrGetCfgValidChannels(pMac, (tANI_U8 *)pMac->roam.validChannelList, &size)))
-    { 
-        *pBuf++ = (tANI_U8)size;        //tSirSupChnl->numChnl        
-        for ( i = 0; i < size; i++) 
+    {
+        *pBuf++ = (tANI_U8)size;        //tSirSupChnl->numChnl
+        for ( i = 0; i < size; i++)
         {
             *pBuf++ = pMac->roam.validChannelList[ i ];   //tSirSupChnl->channelList[ i ]
-             
+
         }
     }
     else
     {
         smsLog(pMac, LOGE, FL("can not find any valid channel"));
         *pBuf++ = 0;  //tSirSupChnl->numChnl
-    }                                                                                                                     
+    }
     //Check whether it is ok to enter UAPSD
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
     if( btcIsReadyForUapsd(pMac) )
@@ -12451,14 +12457,14 @@ static void csrPrepareJoinReassocReqBuffer( tpAniSirGlobal pMac,
         *pBuf++ = 0;
     }
 #endif /* WLAN_MDM_CODE_REDUCTION_OPT*/
-  
+
     // move the entire BssDescription into the join request.
     vos_mem_copy(pBuf, pBssDescription,
                  pBssDescription->length + sizeof( pBssDescription->length ));
     pBuf += pBssDescription->length + sizeof( pBssDescription->length );   // update to new location
 }
 
-/* 
+/*
   * The communication between HDD and LIM is thru mailbox (MB).
   * Both sides will access the data structure "tSirSmeJoinReq".
   *  The rule is, while the components of "tSirSmeJoinReq" can be accessed in the regular way like tSirSmeJoinReq.assocType, this guideline
@@ -12466,7 +12472,7 @@ static void csrPrepareJoinReassocReqBuffer( tpAniSirGlobal pMac,
   *  with the component "tSirBssDescription". And since the size of actual 'tSirBssDescription' varies, the receiving side (which is the routine
   *  limJoinReqSerDes() of limSerDesUtils.cc) should keep in mind not to access the components DIRECTLY after tSirRSNie.
   */
-eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDescription *pBssDescription, 
+eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDescription *pBssDescription,
                               tCsrRoamProfile *pProfile, tDot11fBeaconIEs *pIes, tANI_U16 messageType )
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -12498,14 +12504,14 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe
         pSession->joinFailStatusCode.reasonCode = 0;
         memcpy (&pSession->joinFailStatusCode.bssId, &pBssDescription->bssId, sizeof(tSirMacAddr));
         // There are a number of variable length fields to consider.  First, the tSirSmeJoinReq
-        // includes a single bssDescription.   bssDescription includes a single tANI_U32 for the 
-        // IE fields, but the length field in the bssDescription needs to be interpreted to 
+        // includes a single bssDescription.   bssDescription includes a single tANI_U32 for the
+        // IE fields, but the length field in the bssDescription needs to be interpreted to
         // determine length of the IE fields.
         //
-        // So, take the size of the JoinReq, subtract the size of the bssDescription and 
+        // So, take the size of the JoinReq, subtract the size of the bssDescription and
         // add in the length from the bssDescription (then add the size of the 'length' field
         // itself because that is NOT included in the length field).
-        msgLen = sizeof( tSirSmeJoinReq ) - sizeof( *pBssDescription ) + 
+        msgLen = sizeof( tSirSmeJoinReq ) - sizeof( *pBssDescription ) +
             pBssDescription->length + sizeof( pBssDescription->length ) +
             sizeof( tCsrWpaIe ) + sizeof( tCsrWpaAuthIe ) + sizeof( tANI_U16 ); // add in the size of the WPA IE that we may build.
         pMsg = vos_mem_malloc(msgLen);
@@ -13129,7 +13135,7 @@ eHalStatus csrSendMBDisassocReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSi
         *pBuf = 0;
         *( pBuf + 1 ) = 0;
         pBuf += sizeof(tANI_U16);
-     
+
         if ( (pSession->pCurRoamProfile != NULL) &&
              ((CSR_IS_INFRA_AP(pSession->pCurRoamProfile)) ||
               (CSR_IS_WDS_AP(pSession->pCurRoamProfile))) )
@@ -13170,13 +13176,13 @@ eHalStatus csrSendMBDisassocReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSi
             break;
         }
         pBuf += sizeof(tANI_U16);
-        /* The state will be DISASSOC_HANDOFF only when we are doing handoff. 
+        /* The state will be DISASSOC_HANDOFF only when we are doing handoff.
                     Here we should not send the disassoc over the air to the AP */
         if ( CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, sessionId)
 #ifdef WLAN_FEATURE_VOWIFI_11R
                 && csrRoamIs11rAssoc(pMac)
 #endif
-           )            
+           )
         {
             *pBuf = CSR_DONT_SEND_DISASSOC_OVER_THE_AIR;  /* Set DoNotSendOverTheAir flag to 1 only for handoff case */
         }
@@ -13248,7 +13254,7 @@ csrSendMBGetAssociatedStasReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId,
         // bssId
         vos_mem_copy((tSirMacAddr *)pBuf, bssId, sizeof(tSirMacAddr));
         pBuf += sizeof(tSirMacAddr);
-        // modId 
+        // modId
         dwTmp = pal_cpu_to_be16((tANI_U16)modId);
         vos_mem_copy(pBuf, (tANI_U8 *)&dwTmp, sizeof(tANI_U16));
         pBuf += sizeof(tANI_U16);
@@ -13336,7 +13342,7 @@ csrSendChngMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U32 sessionId)
     pMac->roam.roamSession[sessionId].bssParams.updatebeaconInterval =  eANI_BOOLEAN_FALSE;
 
      /* Create the message and send to lim */
-     len = sizeof(tSirChangeBIParams); 
+     len = sizeof(tSirChangeBIParams);
      pMsg = vos_mem_malloc(len);
      if ( NULL == pMsg )
         status = eHAL_STATUS_FAILURE;
@@ -13355,7 +13361,7 @@ csrSendChngMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U32 sessionId)
                MAC_ADDR_ARRAY(pMsg->bssId));
         pMsg->sessionId       = sessionId;
         smsLog(pMac, LOG1, FL("  session %d BeaconInterval %d"), sessionId, pMac->roam.roamSession[sessionId].bssParams.beaconInterval);
-        pMsg->beaconInterval = pMac->roam.roamSession[sessionId].bssParams.beaconInterval; 
+        pMsg->beaconInterval = pMac->roam.roamSession[sessionId].bssParams.beaconInterval;
         status = palSendMBMessage(pMac->hHdd, pMsg);
     }
      return status;
@@ -13383,14 +13389,14 @@ eHalStatus csrSendMBDeauthReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirM
         //sessionId
         pBuf = &pMsg->sessionId;
         *pBuf++ = (tANI_U8)sessionId;
-        
+
         //tansactionId
         *pBuf = 0;
         *(pBuf + 1 ) = 0;
         pBuf += sizeof(tANI_U16);
         if ((pSession->pCurRoamProfile != NULL)  && (
-             (CSR_IS_INFRA_AP(pSession->pCurRoamProfile)) || 
-             (CSR_IS_WDS_AP(pSession->pCurRoamProfile)))){ 
+             (CSR_IS_INFRA_AP(pSession->pCurRoamProfile)) ||
+             (CSR_IS_WDS_AP(pSession->pCurRoamProfile)))){
             // Set the BSSID before sending the message to LIM
             vos_mem_copy( (tSirMacAddr *)pBuf, pSession->selfMacAddr,
                            sizeof( pMsg->peerMacAddr ) );
@@ -13408,7 +13414,7 @@ eHalStatus csrSendMBDeauthReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirM
         {
             vos_mem_free(pMsg);
             break;
-        }     
+        }
                 // Set the peer MAC address before sending the message to LIM
         vos_mem_copy( (tSirMacAddr *) pBuf, bssId, sizeof( pMsg->peerMacAddr ) );
         status = eHAL_STATUS_SUCCESS;
@@ -13417,7 +13423,7 @@ eHalStatus csrSendMBDeauthReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirM
         {
             vos_mem_free(pMsg);
             break;
-        }     
+        }
         wTmp = pal_cpu_to_be16(reasonCode);
         vos_mem_copy( pBuf, &wTmp,sizeof( tANI_U16 ) );
         status = eHAL_STATUS_SUCCESS;
@@ -13454,7 +13460,7 @@ eHalStatus csrSendMBDisassocCnfMsg( tpAniSirGlobal pMac, tpSirSmeDisassocInd pDi
             vos_mem_free(pMsg);
             break;
         }
-//To test reconn        
+//To test reconn
         vos_mem_copy(pMsg->bssId, pDisassocInd->bssId, sizeof(pMsg->peerMacAddr));
         status = eHAL_STATUS_SUCCESS;
         if(!HAL_STATUS_SUCCESS(status))
@@ -13554,9 +13560,9 @@ eHalStatus csrSendAssocCnfMsg( tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd,
     } while( 0 );
     return( status );
 }
-eHalStatus csrSendAssocIndToUpperLayerCnfMsg(   tpAniSirGlobal pMac, 
-                                                tpSirSmeAssocInd pAssocInd, 
-                                                eHalStatus Halstatus, 
+eHalStatus csrSendAssocIndToUpperLayerCnfMsg(   tpAniSirGlobal pMac,
+                                                tpSirSmeAssocInd pAssocInd,
+                                                eHalStatus Halstatus,
                                                 tANI_U8 sessionId)
 {
     tSirMsgQ            msgQ;
@@ -13623,9 +13629,9 @@ eHalStatus csrSendAssocIndToUpperLayerCnfMsg(   tpAniSirGlobal pMac,
 }
 
 eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId,
-            tSirMacAddr peerMacAddr, tANI_U8 numKeys, tAniEdType edType, 
+            tSirMacAddr peerMacAddr, tANI_U8 numKeys, tAniEdType edType,
             tANI_BOOLEAN fUnicast, tAniKeyDirection aniKeyDirection,
-            tANI_U8 keyId, tANI_U8 keyLength, tANI_U8 *pKey, tANI_U8 paeRole, 
+            tANI_U8 keyId, tANI_U8 keyLength, tANI_U8 *pKey, tANI_U8 paeRole,
             tANI_U8 *pKeyRsc )
 {
     tSirSmeSetContextReq *pMsg;
@@ -13638,13 +13644,13 @@ eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId,
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
     do {
         if( ( 1 != numKeys ) && ( 0 != numKeys ) ) break;
-        // all of these fields appear in every SET_CONTEXT message.  Below we'll add in the size for each 
+        // all of these fields appear in every SET_CONTEXT message.  Below we'll add in the size for each
         // key set. Since we only support upto one key, we always allocate memory for 1 key
         msgLen  = sizeof( tANI_U16) + sizeof( tANI_U16 ) + sizeof( tSirMacAddr ) +
                   sizeof( tSirMacAddr ) + 1 + sizeof(tANI_U16) +
                   sizeof( pMsg->keyMaterial.length ) + sizeof( pMsg->keyMaterial.edType ) + sizeof( pMsg->keyMaterial.numKeys ) +
                   ( sizeof( pMsg->keyMaterial.key ) );
-                     
+
         pMsg = vos_mem_malloc(msgLen);
         if ( NULL == pMsg ) return eHAL_STATUS_FAILURE;
         vos_mem_set(pMsg, msgLen, 0);
@@ -13673,7 +13679,7 @@ eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId,
                 // Set the pMsg->keyMaterial.length field (this length is defined as all data that follows the edType field
                 // in the tSirKeyMaterial keyMaterial; field).
                 //
-                // !!NOTE:  This keyMaterial.length contains the length of a MAX size key, though the keyLength can be 
+                // !!NOTE:  This keyMaterial.length contains the length of a MAX size key, though the keyLength can be
                 // shorter than this max size.  Is LIM interpreting this ok ?
                 p = pal_set_U16( p, pal_cpu_to_be16((tANI_U16)( sizeof( pMsg->keyMaterial.numKeys ) + ( numKeys * sizeof( pMsg->keyMaterial.key ) ) )) );
                 // set pMsg->keyMaterial.edType
@@ -13682,7 +13688,7 @@ eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId,
         p += sizeof( pMsg->keyMaterial.edType );
         // set the pMsg->keyMaterial.numKeys field
         *p = numKeys;
-        p += sizeof( pMsg->keyMaterial.numKeys );   
+        p += sizeof( pMsg->keyMaterial.numKeys );
         // set pSirKey->keyId = keyId;
         *p = keyId;
         p += sizeof( pMsg->keyMaterial.key[ 0 ].keyId );
@@ -13701,8 +13707,8 @@ eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId,
                 p++;
                 // set pSirKey->keyLength = keyLength;
                 p = pal_set_U16( p, pal_cpu_to_be16(keyLength) );
-        if ( keyLength && pKey ) 
-        {   
+        if ( keyLength && pKey )
+        {
             vos_mem_copy(p, pKey, keyLength);
             if(keyLength == 16)
             {
@@ -13717,7 +13723,7 @@ eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId,
     return( status );
 }
 
-eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamBssType bssType, 
+eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamBssType bssType,
                                     tCsrRoamStartBssParams *pParam, tSirBssDescription *pBssDesc )
 {
     eHalStatus status;
@@ -13736,7 +13742,7 @@ eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCs
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     do {
         pSession->joinFailStatusCode.statusCode = eSIR_SME_SUCCESS;
         pSession->joinFailStatusCode.reasonCode = 0;
@@ -13754,7 +13760,7 @@ eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCs
         *pBuf = 0;
         *(pBuf + 1) = 0;
         pBuf += sizeof(tANI_U16);
-        // bssid 
+        // bssid
         vos_mem_copy(pBuf, pParam->bssid, sizeof(tSirMacAddr));
         pBuf += sizeof(tSirMacAddr);
         // selfMacAddr
@@ -13776,10 +13782,10 @@ eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCs
         if(csrIsconcurrentsessionValid (pMac, sessionId,
                                    pParam->bssPersona)
                                    == eHAL_STATUS_SUCCESS )
-        {    
+        {
            csrValidateMCCBeaconInterval(pMac, pParam->operationChn, &wTmp, sessionId,
                                       pParam->bssPersona);
-           //Update the beacon Interval 
+           //Update the beacon Interval
            pParam->beaconInterval = wTmp;
         }
         else
@@ -13811,7 +13817,7 @@ eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCs
         else
         {
             *pBuf = 0;
-            pBuf++;        
+            pBuf++;
         }
         // set the channel Id
         *pBuf = pParam->operationChn;
@@ -13824,8 +13830,8 @@ eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCs
         // Set privacy
         *pBuf = pParam->privacy;
         pBuf++;
- 
-        //Set Uapsd 
+
+        //Set Uapsd
         *pBuf = pParam->ApUapsdEnable;
         pBuf++;
         //Set SSID hidden
@@ -13833,7 +13839,7 @@ eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCs
         pBuf++;
         *pBuf = (tANI_U8)pParam->fwdWPSPBCProbeReq;
         pBuf++;
-        
+
         //Ht protection Enable/Disable
         *pBuf = (tANI_U8)pParam->protEnabled;
         pBuf++;
@@ -13861,7 +13867,7 @@ eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCs
         //Persona
         *pBuf = (tANI_U8)pParam->bssPersona;
         pBuf++;
-        
+
         //txLdpcIniFeatureEnabled
         *pBuf = (tANI_U8)(tANI_U8)pMac->roam.configParam.txLdpcEnable;
         pBuf++;
@@ -13904,7 +13910,7 @@ eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCs
 		  pBuf += sizeof(tSirHTConfig);
         msgLen = (tANI_U16)(sizeof(tANI_U32 ) + (pBuf - wTmpBuf)); //msg_header + msg
         pMsg->length = pal_cpu_to_be16(msgLen);
-        
+
         status = palSendMBMessage(pMac->hHdd, pMsg);
     } while( 0 );
   return( status );
@@ -13923,7 +13929,7 @@ eHalStatus csrSendMBStopBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId )
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return eHAL_STATUS_FAILURE;
     }
-    
+
     do {
         pMsg = vos_mem_malloc(sizeof(tSirSmeStopBssReq));
         if ( NULL == pMsg ) return eHAL_STATUS_FAILURE;
@@ -13939,7 +13945,7 @@ eHalStatus csrSendMBStopBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId )
         //reason code
         *pBuf  = 0;
         pBuf += sizeof(tSirResultCodes);
-        // bssid 
+        // bssid
         // if BSSType is WDS sta, use selfmacAddr as bssid, else use bssid in connectedProfile
         if( CSR_IS_CONN_WDS_STA(&pSession->connectedProfile) )
         {
@@ -13955,7 +13961,7 @@ eHalStatus csrSendMBStopBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId )
        msgLen = sizeof(tANI_U16) + sizeof(tANI_U16) + 1 + sizeof(tANI_U16) + sizeof(tSirResultCodes) + sizeof(tSirMacAddr);
        pMsg->length =  pal_cpu_to_be16(msgLen);
        status =  palSendMBMessage( pMac->hHdd, pMsg );
-#if 0            
+#if 0
         pMsg = vos_mem_malloc(sizeof(tSirSmeStopBssReq));
         if ( NULL == pMsg ) return eHAL_STATUS_FAILURE;
         vos_mem_set(pMsg, sizeof( tSirSmeStopBssReq ), 0);
@@ -13976,12 +13982,12 @@ eHalStatus csrSendMBStopBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId )
         pMsg->sessionId = (tANI_U8)sessionId;
                 pMsg->length = pal_cpu_to_be16((tANI_U16)sizeof( tSirSmeStopBssReq ));
                 status = palSendMBMessage( pMac->hHdd, pMsg );
-#endif                
+#endif
         } while( 0 );
     return( status );
 }
 
-eHalStatus csrReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId, 
+eHalStatus csrReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId,
                       tCsrRoamModifyProfileFields *pModProfileFields,
                       tANI_U32 *pRoamId, v_BOOL_t fForce)
 {
@@ -13999,8 +14005,8 @@ eHalStatus csrReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId,
          *pRoamId = roamId;
       }
 
-      status = csrRoamIssueReassoc(pMac, sessionId, NULL, pModProfileFields, 
-                                   eCsrSmeIssuedReassocToSameAP, roamId, 
+      status = csrRoamIssueReassoc(pMac, sessionId, NULL, pModProfileFields,
+                                   eCsrSmeIssuedReassocToSameAP, roamId,
                                    eANI_BOOLEAN_FALSE);
    }
    return status;
@@ -14232,7 +14238,7 @@ eHalStatus csrProcessDelStaSessionRsp( tpAniSirGlobal pMac, tANI_U8 *pMsg)
             csrCleanupSession(pMac, sessionId);
             if(pCommand->u.delStaSessionCmd.callback)
             {
-                 
+
                 status = sme_ReleaseGlobalLock( &pMac->sme );
                 if ( HAL_STATUS_SUCCESS( status ) )
                 {
@@ -14248,8 +14254,8 @@ eHalStatus csrProcessDelStaSessionRsp( tpAniSirGlobal pMac, tANI_U8 *pMsg)
                 else {
                     smsLog(pMac, LOGE, "%s: Failed to Release Lock", __func__);
                 }
-            } 
-   
+            }
+
             //Remove this command out of the active list
             if(csrLLRemoveEntry(&pMac->sme.smeCmdActiveList, pEntry, LL_ACCESS_LOCK))
             {
@@ -14288,7 +14294,7 @@ eHalStatus csrSendMBDelSelfStaReqMsg( tpAniSirGlobal pMac, tSirMacAddr macAddr,
       if (NULL == pMsg)
 			return eHAL_STATUS_FAILURE;
       vos_mem_set(pMsg, msgLen, 0);
-   
+
       pMsg->mesgType = pal_cpu_to_be16((tANI_U16)eWNI_SME_DEL_STA_SELF_REQ);
       pMsg->mesgLen = pal_cpu_to_be16(msgLen);
       pMsg->sessionId = sessionId;
@@ -14330,7 +14336,7 @@ eHalStatus csrIssueDelStaForSessionReq(tpAniSirGlobal pMac, tANI_U32 sessionId,
 }
 eHalStatus csrProcessDelStaSessionCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
 {
-   return csrSendMBDelSelfStaReqMsg( pMac, 
+   return csrSendMBDelSelfStaReqMsg( pMac,
          pCommand->u.delStaSessionCmd.selfMacAddr,
          (tANI_U8)pCommand->sessionId);
 }
@@ -14398,7 +14404,7 @@ void csrCleanupSession(tpAniSirGlobal pMac, tANI_U32 sessionId)
 }
 
 eHalStatus csrRoamCloseSession( tpAniSirGlobal pMac, tANI_U32 sessionId,
-                                tANI_BOOLEAN fSync, 
+                                tANI_BOOLEAN fSync,
                                 csrRoamSessionCloseCallback callback,
                                 void *pContext )
 {
@@ -14411,7 +14417,7 @@ eHalStatus csrRoamCloseSession( tpAniSirGlobal pMac, tANI_U32 sessionId,
             csrCleanupSession(pMac, sessionId);
         }
         else
-        { 
+        {
             purgeSmeSessionCmdList(pMac, sessionId,
                     &pMac->sme.smeCmdPendingList);
             if (pMac->fScanOffload)
@@ -14440,7 +14446,7 @@ static void csrInitSession( tpAniSirGlobal pMac, tANI_U32 sessionId )
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return;
     }
-    
+
     pSession->sessionActive = eANI_BOOLEAN_FALSE;
     pSession->sessionId = CSR_SESSION_ID_INVALID;
     pSession->callback = NULL;
@@ -14513,7 +14519,7 @@ eHalStatus csrRoamGetSessionIdFromBSSID( tpAniSirGlobal pMac, tCsrBssid *bssid,
     return( status );
 }
 
-//This function assumes that we only support one IBSS session. We cannot use BSSID to identify 
+//This function assumes that we only support one IBSS session. We cannot use BSSID to identify
 //session because for IBSS, the bssid changes.
 static tANI_U32 csrFindIbssSession( tpAniSirGlobal pMac )
 {
@@ -14536,19 +14542,19 @@ static tANI_U32 csrFindIbssSession( tpAniSirGlobal pMac )
 }
 static void csrRoamLinkUp(tpAniSirGlobal pMac, tCsrBssid bssid)
 {
-   /* Update the current BSS info in ho control block based on connected 
+   /* Update the current BSS info in ho control block based on connected
       profile info from pmac global structure                              */
-   
+
    smsLog(pMac, LOGW, " csrRoamLinkUp: WLAN link UP with AP= "MAC_ADDRESS_STR,
           MAC_ADDR_ARRAY(bssid));
    /* Check for user misconfig of RSSI trigger threshold                  */
    pMac->roam.configParam.vccRssiThreshold =
-      ( 0 == pMac->roam.configParam.vccRssiThreshold ) ? 
+      ( 0 == pMac->roam.configParam.vccRssiThreshold ) ?
       CSR_VCC_RSSI_THRESHOLD : pMac->roam.configParam.vccRssiThreshold;
    pMac->roam.vccLinkQuality = eCSR_ROAM_LINK_QUAL_POOR_IND;
     /* Check for user misconfig of UL MAC Loss trigger threshold           */
    pMac->roam.configParam.vccUlMacLossThreshold =
-      ( 0 == pMac->roam.configParam.vccUlMacLossThreshold ) ? 
+      ( 0 == pMac->roam.configParam.vccUlMacLossThreshold ) ?
       CSR_VCC_UL_MAC_LOSS_THRESHOLD : pMac->roam.configParam.vccUlMacLossThreshold;
 #if   defined WLAN_FEATURE_NEIGHBOR_ROAMING
     {
@@ -14569,7 +14575,7 @@ static void csrRoamLinkDown(tpAniSirGlobal pMac, tANI_U32 sessionId)
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return;
     }
-    
+
    //Only to handle the case for Handover on infra link
    if( eCSR_BSS_TYPE_INFRASTRUCTURE != pSession->connectedProfile.BSSType )
    {
@@ -14597,10 +14603,10 @@ static void csrRoamLinkDown(tpAniSirGlobal pMac, tANI_U32 sessionId)
    csrNeighborRoamIndicateDisconnect(pMac, sessionId);
 #endif
 
-    //Remove this code once SLM_Sessionization is supported 
+    //Remove this code once SLM_Sessionization is supported
     //BMPS_WORKAROUND_NOT_NEEDED
-    if(!IS_FEATURE_SUPPORTED_BY_FW(SLM_SESSIONIZATION) && 
-        csrIsInfraApStarted( pMac ) &&  
+    if(!IS_FEATURE_SUPPORTED_BY_FW(SLM_SESSIONIZATION) &&
+        csrIsInfraApStarted( pMac ) &&
         pMac->roam.configParam.doBMPSWorkaround)
    {
        pMac->roam.configParam.doBMPSWorkaround = 0;
@@ -14658,7 +14664,7 @@ void csrRoamPeStatsTimerHandler(void *pv)
    pPeStatsReqListEntry->timerRunning = FALSE;
    if( pPeStatsReqListEntry->timerStopFailed == TRUE )
    {
-      // If we entered here, meaning the timer could not be successfully 
+      // If we entered here, meaning the timer could not be successfully
       // stopped in csrRoamRemoveEntryFromPeStatsReqList(). So do it here.
 
       /* Destroy the timer */
@@ -14676,7 +14682,7 @@ void csrRoamPeStatsTimerHandler(void *pv)
    {
       if(!pPeStatsReqListEntry->rspPending)
       {
-         status = csrSendMBStatsReqMsg(pMac, pPeStatsReqListEntry->statsMask & ~(1 << eCsrGlobalClassDStats), 
+         status = csrSendMBStatsReqMsg(pMac, pPeStatsReqListEntry->statsMask & ~(1 << eCsrGlobalClassDStats),
                                        pPeStatsReqListEntry->staId,
                                        pPeStatsReqListEntry->sessionId);
          if(!HAL_STATUS_SUCCESS(status))
@@ -14690,7 +14696,7 @@ void csrRoamPeStatsTimerHandler(void *pv)
       }
 
       //send down a req
-      if(pPeStatsReqListEntry->periodicity && 
+      if(pPeStatsReqListEntry->periodicity &&
          (VOS_TIMER_STATE_STOPPED == vos_timer_getCurrentState(&pPeStatsReqListEntry->hPeStatsTimer)))
       {
          pmcQueryPowerState(pMac, &powerState, NULL, NULL);
@@ -14710,7 +14716,7 @@ void csrRoamPeStatsTimerHandler(void *pv)
          }
          //start timer
          vosStatus = vos_timer_start( &pPeStatsReqListEntry->hPeStatsTimer, pPeStatsReqListEntry->periodicity );
-         if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) ) 
+         if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
          {
             smsLog(pMac, LOGE, FL("csrRoamPeStatsTimerHandler:cannot start hPeStatsTimer timer"));
             return;
@@ -14730,16 +14736,16 @@ void csrRoamStatsClientTimerHandler(void *pv)
        // TODO Stats fix for multisession
        //start the timer
        vosStatus = vos_timer_start( &pStaEntry->timer, pStaEntry->periodicity );
-   
-       if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) ) 
+
+       if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
        {
           smsLog(pStaEntry->pMac, LOGE, FL("csrGetStatistics:cannot start StatsClient timer"));
        }
-#endif       
+#endif
    }
 #if 0
    //send up the stats report
-   csrRoamReportStatistics(pStaEntry->pMac, pStaEntry->statsMask, pStaEntry->callback, 
+   csrRoamReportStatistics(pStaEntry->pMac, pStaEntry->statsMask, pStaEntry->callback,
                            pStaEntry->staId, pStaEntry->pContext);
 #endif
 }
@@ -14763,7 +14769,7 @@ eHalStatus csrSendMBStatsReqMsg( tpAniSirGlobal pMac, tANI_U32 statsMask,
    pMsg->staId = staId;
    pMsg->statsMask = statsMask;
    pMsg->sessionId = sessionId;
-   status = palSendMBMessage(pMac->hHdd, pMsg );    
+   status = palSendMBMessage(pMac->hHdd, pMsg );
    if(!HAL_STATUS_SUCCESS(status))
    {
       smsLog(pMac, LOG1, " csrSendMBStatsReqMsg: failed to send down the stats req ");
@@ -14793,8 +14799,8 @@ void csrRoamStatsRspProcessor(tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg)
    }
    tempMask = pSmeStatsRsp->statsMask;
    pStats = ((tANI_U8 *)&pSmeStatsRsp->statsMask) + sizeof(pSmeStatsRsp->statsMask);
-   /* subtract all statistics from this length, and after processing the entire 
-    * 'stat' part of the message, if the length is not zero, then rssi is piggy packed 
+   /* subtract all statistics from this length, and after processing the entire
+    * 'stat' part of the message, if the length is not zero, then rssi is piggy packed
     * in this 'stats' message.
     */
    length = pSmeStatsRsp->msgLen - sizeof(tAniGetPEStatsRsp);
@@ -14901,14 +14907,14 @@ void csrRoamStatsRspProcessor(tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg)
    }
 
    WDA_UpdateSnrBmps(pvosGCtx, pSmeStatsRsp->staId, snr);
-post_update:   
-   //make sure to update the pe stats req list 
+post_update:
+   //make sure to update the pe stats req list
    pEntry = csrRoamFindInPeStatsReqList(pMac, pSmeStatsRsp->statsMask);
    if(pEntry)
       {
       pPeStaEntry = GET_BASE_ADDR( pEntry, tCsrPeStatsReqInfo, link );
       pPeStaEntry->rspPending = FALSE;
-   
+
    }
    //check the one timer cases
    pEntry = csrRoamCheckClientReqList(pMac, pSmeStatsRsp->statsMask);
@@ -14918,7 +14924,7 @@ post_update:
       if(pTempStaEntry->timerExpired)
       {
          //send up the stats report
-         csrRoamReportStatistics(pMac, pTempStaEntry->statsMask, pTempStaEntry->callback, 
+         csrRoamReportStatistics(pMac, pTempStaEntry->statsMask, pTempStaEntry->callback,
                                  pTempStaEntry->staId, pTempStaEntry->pContext);
          //also remove from the client list
          csrRoamRemoveStatListEntry(pMac, pEntry);
@@ -14966,7 +14972,7 @@ tListElem * csrRoamChecknUpdateClientReqList(tpAniSirGlobal pMac, tCsrStatsClien
    while( pEntry )
    {
       pTempStaEntry = GET_BASE_ADDR( pEntry, tCsrStatsClientReqInfo, link );
-      if((pTempStaEntry->requesterId == pStaEntry->requesterId) && 
+      if((pTempStaEntry->requesterId == pStaEntry->requesterId) &&
          (pTempStaEntry->statsMask == pStaEntry->statsMask))
       {
          smsLog(pMac, LOG3, "csrRoamChecknUpdateClientReqList: match found");
@@ -15007,7 +15013,7 @@ tListElem * csrRoamCheckClientReqList(tpAniSirGlobal pMac, tANI_U32 statsMask)
    return pEntry;
 }
 eHalStatus csrRoamRegisterLinkQualityIndCallback(tpAniSirGlobal pMac,
-                                                 csrRoamLinkQualityIndCallback   callback,  
+                                                 csrRoamLinkQualityIndCallback   callback,
                                                  void                           *pContext)
 {
    pMac->roam.linkQualityIndInfo.callback = callback;
@@ -15033,7 +15039,7 @@ void csrRoamVccTrigger(tpAniSirGlobal pMac)
      Link quality is currently binary based on OBIWAN recommended triggers
      Check for a change in link quality and notify client if necessary
    -------------------------------------------------------------------------*/
-   ul_mac_loss_trigger_threshold = 
+   ul_mac_loss_trigger_threshold =
       pMac->roam.configParam.vccUlMacLossThreshold;
    if (0 == ul_mac_loss_trigger_threshold)
    {
@@ -15057,13 +15063,13 @@ void csrRoamVccTrigger(tpAniSirGlobal pMac)
    if(newVccLinkQuality != pMac->roam.vccLinkQuality)
    {
       smsLog(pMac, LOGW, "csrRoamVccTrigger: link quality changed: trigger necessary");
-      if(NULL != pMac->roam.linkQualityIndInfo.callback) 
+      if(NULL != pMac->roam.linkQualityIndInfo.callback)
       {
          smsLog(pMac, LOGW, "csrRoamVccTrigger: link quality indication %d",
                 newVccLinkQuality );
-         
+
          /* we now invoke the callback once to notify client of initial value   */
-         pMac->roam.linkQualityIndInfo.callback( newVccLinkQuality, 
+         pMac->roam.linkQualityIndInfo.callback( newVccLinkQuality,
                                                  pMac->roam.linkQualityIndInfo.context );
          //event: EVENT_WLAN_VCC
       }
@@ -15071,8 +15077,8 @@ void csrRoamVccTrigger(tpAniSirGlobal pMac)
    pMac->roam.vccLinkQuality = newVccLinkQuality;
 
 }
-VOS_STATUS csrRoamVccTriggerRssiIndCallback(tHalHandle hHal, 
-                                            v_U8_t  rssiNotification, 
+VOS_STATUS csrRoamVccTriggerRssiIndCallback(tHalHandle hHal,
+                                            v_U8_t  rssiNotification,
                                             void * context)
 {
    tpAniSirGlobal pMac = PMAC_STRUCT( context );
@@ -15105,19 +15111,19 @@ VOS_STATUS csrRoamVccTriggerRssiIndCallback(tHalHandle hHal,
    {
       smsLog(pMac, LOGW, "csrRoamVccTriggerRssiIndCallback: unknown rssi notification %d", rssiNotification);
       //Set to this so the code below won't do anything
-      newVccLinkQuality = pMac->roam.vccLinkQuality;    
+      newVccLinkQuality = pMac->roam.vccLinkQuality;
       VOS_ASSERT(0);
    }
 
    if(newVccLinkQuality != pMac->roam.vccLinkQuality)
    {
       smsLog(pMac, LOGW, "csrRoamVccTriggerRssiIndCallback: link quality changed: trigger necessary");
-      if(NULL != pMac->roam.linkQualityIndInfo.callback) 
+      if(NULL != pMac->roam.linkQualityIndInfo.callback)
       {
          smsLog(pMac, LOGW, "csrRoamVccTriggerRssiIndCallback: link quality indication %d",
                 newVccLinkQuality);
         /* we now invoke the callback once to notify client of initial value   */
-        pMac->roam.linkQualityIndInfo.callback( newVccLinkQuality, 
+        pMac->roam.linkQualityIndInfo.callback( newVccLinkQuality,
                                                 pMac->roam.linkQualityIndInfo.context );
          //event: EVENT_WLAN_VCC
       }
@@ -15130,11 +15136,11 @@ tCsrStatsClientReqInfo * csrRoamInsertEntryIntoList( tpAniSirGlobal pMac,
                                                      tCsrStatsClientReqInfo *pStaEntry)
 {
    tCsrStatsClientReqInfo *pNewStaEntry = NULL;
-   //if same entity requested for same set of stats with different periodicity & 
+   //if same entity requested for same set of stats with different periodicity &
    // callback update it
    if(NULL == csrRoamChecknUpdateClientReqList(pMac, pStaEntry, TRUE))
    {
-   
+
       pNewStaEntry = vos_mem_malloc(sizeof(tCsrStatsClientReqInfo));
       if (NULL == pNewStaEntry)
       {
@@ -15142,7 +15148,7 @@ tCsrStatsClientReqInfo * csrRoamInsertEntryIntoList( tpAniSirGlobal pMac,
                 "entry");
          return NULL;
       }
-   
+
       pNewStaEntry->callback = pStaEntry->callback;
       pNewStaEntry->pContext = pStaEntry->pContext;
       pNewStaEntry->periodicity = pStaEntry->periodicity;
@@ -15152,7 +15158,7 @@ tCsrStatsClientReqInfo * csrRoamInsertEntryIntoList( tpAniSirGlobal pMac,
       pNewStaEntry->pMac = pStaEntry->pMac;
       pNewStaEntry->staId = pStaEntry->staId;
       pNewStaEntry->timerExpired = pStaEntry->timerExpired;
-      
+
       csrLLInsertTail( pStaList, &pNewStaEntry->link, LL_ACCESS_LOCK  );
    }
    return pNewStaEntry;
@@ -15170,7 +15176,7 @@ tCsrPeStatsReqInfo * csrRoamInsertEntryIntoPeStatsReqList( tpAniSirGlobal pMac,
                   "entry");
       return NULL;
    }
-   
+
    pNewStaEntry->hPeStatsTimer = pStaEntry->hPeStatsTimer;
    pNewStaEntry->numClient = pStaEntry->numClient;
    pNewStaEntry->periodicity = pStaEntry->periodicity;
@@ -15179,14 +15185,14 @@ tCsrPeStatsReqInfo * csrRoamInsertEntryIntoPeStatsReqList( tpAniSirGlobal pMac,
    pNewStaEntry->staId = pStaEntry->staId;
    pNewStaEntry->timerRunning = pStaEntry->timerRunning;
    pNewStaEntry->rspPending = pStaEntry->rspPending;
-   
+
    csrLLInsertTail( pStaList, &pNewStaEntry->link, LL_ACCESS_LOCK  );
    return pNewStaEntry;
 }
-eHalStatus csrGetRssi(tpAniSirGlobal pMac, 
-                            tCsrRssiCallback callback, 
+eHalStatus csrGetRssi(tpAniSirGlobal pMac,
+                            tCsrRssiCallback callback,
                             tANI_U8 staId, tCsrBssid bssId, void *pContext, void* pVosContext)
-{  
+{
    eHalStatus status = eHAL_STATUS_SUCCESS;
    vos_msg_t  msg;
    tANI_U32 sessionId;
@@ -15355,16 +15361,16 @@ tANI_U16 csrGetTLSTAState(tpAniSirGlobal pMac, tANI_U8 staId)
    return tlSTAState;
 }
 
-eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requesterId, 
-                            tANI_U32 statsMask, 
-                            tCsrStatsCallback callback, 
-                            tANI_U32 periodicity, tANI_BOOLEAN cache, 
+eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requesterId,
+                            tANI_U32 statsMask,
+                            tCsrStatsCallback callback,
+                            tANI_U32 periodicity, tANI_BOOLEAN cache,
                             tANI_U8 staId, void *pContext,
                             tANI_U8 sessionId)
-{  
+{
    tCsrStatsClientReqInfo staEntry;
    tCsrStatsClientReqInfo *pStaEntry = NULL;
-   tCsrPeStatsReqInfo *pPeStaEntry = NULL; 
+   tCsrPeStatsReqInfo *pPeStaEntry = NULL;
    tListElem *pEntry = NULL;
    tANI_BOOLEAN found = FALSE;
    eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -15411,7 +15417,7 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
             }
          }
 
-         //check if we need to stop the tl stats timer too 
+         //check if we need to stop the tl stats timer too
          pMac->roam.tlStatsReqInfo.numClient--;
          if(!pMac->roam.tlStatsReqInfo.numClient)
          {
@@ -15428,7 +15434,7 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
             pMac->roam.tlStatsReqInfo.timerRunning = FALSE;
          }
          vos_timer_stop( &pStaEntry->timer );
-         // Destroy the vos timer...      
+         // Destroy the vos timer...
          vosStatus = vos_timer_destroy( &pStaEntry->timer );
          if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
          {
@@ -15439,7 +15445,7 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
          return eHAL_STATUS_SUCCESS;
       }
    }
-   
+
    if(cache && !periodicity)
    {
       //return the cached stats
@@ -15456,18 +15462,18 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
       staEntry.pMac = pMac;
       staEntry.timerExpired = FALSE;
       staEntry.sessionId = sessionId;
-   
-   
+
+
       //if periodic report requested with non cached result from PE/TL
       if(periodicity)
       {
-      
+
          //if looking for stats from PE
          if(statsMask & ~(1 << eCsrGlobalClassDStats))
          {
-         
+
             //check if same request made already & waiting for rsp
-            pPeStaEntry = csrRoamCheckPeStatsReqList(pMac, statsMask & ~(1 << eCsrGlobalClassDStats), 
+            pPeStaEntry = csrRoamCheckPeStatsReqList(pMac, statsMask & ~(1 << eCsrGlobalClassDStats),
                                                periodicity, &found, staId,
                                                sessionId);
             if(!pPeStaEntry)
@@ -15479,7 +15485,7 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
             {
                staEntry.pPeStaEntry = pPeStaEntry;
             }
-               
+
          }
          //request stats from TL rightaway if requested by client, update tlStatsReqInfo if needed
          if(statsMask & (1 << eCsrGlobalClassDStats))
@@ -15490,11 +15496,11 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
             }
             else
             {
-            
+
                //update periodicity
                if(pMac->roam.tlStatsReqInfo.periodicity)
                {
-                  pMac->roam.tlStatsReqInfo.periodicity = 
+                  pMac->roam.tlStatsReqInfo.periodicity =
                      CSR_ROAM_MIN(periodicity, pMac->roam.tlStatsReqInfo.periodicity);
                }
                else
@@ -15505,7 +15511,7 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
                {
                   pMac->roam.tlStatsReqInfo.periodicity = CSR_MIN_TL_STAT_QUERY_PERIOD;
                }
-               
+
                if(!pMac->roam.tlStatsReqInfo.timerRunning)
                {
                   pTlStats = (WLANTL_TRANSFER_STA_TYPE *)vos_mem_malloc(sizeof(WLANTL_TRANSFER_STA_TYPE));
@@ -15545,7 +15551,7 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
             }
             pMac->roam.tlStatsReqInfo.numClient++;
          }
-   
+
          insertInClientList = TRUE;
       }
       //if one time report requested with non cached result from PE/TL
@@ -15591,7 +15597,7 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
             }
 
          }
-         //if looking for stats from TL only 
+         //if looking for stats from TL only
          if(!insertInClientList)
          {
             //return the stats
@@ -15600,7 +15606,7 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
       }
       if(insertInClientList)
       {
-         pStaEntry = csrRoamInsertEntryIntoList(pMac, &pMac->roam.statsClientReqList, &staEntry); 
+         pStaEntry = csrRoamInsertEntryIntoList(pMac, &pMac->roam.statsClientReqList, &staEntry);
          if(!pStaEntry)
          {
             //msg
@@ -15611,7 +15617,7 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
          //Init & start timer if needed
          if(periodicity)
          {
-            vosStatus = vos_timer_init( &pStaEntry->timer, VOS_TIMER_TYPE_SW, 
+            vosStatus = vos_timer_init( &pStaEntry->timer, VOS_TIMER_TYPE_SW,
                                         csrRoamStatsClientTimerHandler, pStaEntry );
             if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
             {
@@ -15619,7 +15625,7 @@ eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requeste
                return eHAL_STATUS_FAILURE;
             }
             vosStatus = vos_timer_start( &pStaEntry->timer, periodicity );
-            if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) ) 
+            if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
             {
                smsLog(pMac, LOGE, FL("csrGetStatistics:cannot start StatsClient timer"));
                return eHAL_STATUS_FAILURE;
@@ -16086,14 +16092,14 @@ tCsrPeStatsReqInfo * csrRoamCheckPeStatsReqList(tpAniSirGlobal pMac,
    VOS_STATUS vosStatus;
    tPmcPowerState powerState;
    *pFound = FALSE;
-      
+
    pStaEntry = csrRoamFindInPeStatsReqList(pMac, statsMask);
    if(pStaEntry)
    {
       pTempStaEntry = GET_BASE_ADDR( pStaEntry, tCsrPeStatsReqInfo, link );
       if(pTempStaEntry->periodicity)
       {
-         pTempStaEntry->periodicity = 
+         pTempStaEntry->periodicity =
             CSR_ROAM_MIN(periodicity, pTempStaEntry->periodicity);
       }
       else
@@ -16114,7 +16120,7 @@ tCsrPeStatsReqInfo * csrRoamCheckPeStatsReqList(tpAniSirGlobal pMac,
       staEntry.statsMask = statsMask;
       staEntry.timerRunning = FALSE;
       staEntry.sessionId = sessionId;
-      pTempStaEntry = csrRoamInsertEntryIntoPeStatsReqList(pMac, &pMac->roam.peStatsReqList, &staEntry); 
+      pTempStaEntry = csrRoamInsertEntryIntoPeStatsReqList(pMac, &pMac->roam.peStatsReqList, &staEntry);
       if(!pTempStaEntry)
       {
          //msg
@@ -16140,7 +16146,7 @@ tCsrPeStatsReqInfo * csrRoamCheckPeStatsReqList(tpAniSirGlobal pMac,
    if(!pTempStaEntry->timerRunning)
    {
       //send down a req in case of one time req, for periodic ones wait for timer to expire
-      if(!pTempStaEntry->rspPending && 
+      if(!pTempStaEntry->rspPending &&
          !pTempStaEntry->periodicity)
       {
          status = csrSendMBStatsReqMsg(pMac,
@@ -16160,8 +16166,8 @@ tCsrPeStatsReqInfo * csrRoamCheckPeStatsReqList(tpAniSirGlobal pMac,
       {
          if(!found)
          {
-            
-            vosStatus = vos_timer_init( &pTempStaEntry->hPeStatsTimer, VOS_TIMER_TYPE_SW, 
+
+            vosStatus = vos_timer_init( &pTempStaEntry->hPeStatsTimer, VOS_TIMER_TYPE_SW,
                                         csrRoamPeStatsTimerHandler, pTempStaEntry );
             if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
             {
@@ -16172,7 +16178,7 @@ tCsrPeStatsReqInfo * csrRoamCheckPeStatsReqList(tpAniSirGlobal pMac,
          //start timer
          smsLog(pMac, LOG1, "csrRoamCheckPeStatsReqList:peStatsTimer period %d", pTempStaEntry->periodicity);
          vosStatus = vos_timer_start( &pTempStaEntry->hPeStatsTimer, pTempStaEntry->periodicity );
-         if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) ) 
+         if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
          {
             smsLog(pMac, LOGE, FL("csrRoamCheckPeStatsReqList:cannot start hPeStatsTimer timer"));
             return NULL;
@@ -16219,8 +16225,8 @@ void csrRoamRemoveEntryFromPeStatsReqList(tpAniSirGlobal pMac, tCsrPeStatsReqInf
          if(pTempStaEntry->timerRunning)
          {
             vosStatus = vos_timer_stop( &pTempStaEntry->hPeStatsTimer );
-            /* If we are not able to stop the timer here, just remove 
-             * the entry from the linked list. Destroy the timer object 
+            /* If we are not able to stop the timer here, just remove
+             * the entry from the linked list. Destroy the timer object
              * and free the memory in the timer CB
              */
             if ( vosStatus == VOS_STATUS_SUCCESS )
@@ -16237,11 +16243,11 @@ void csrRoamRemoveEntryFromPeStatsReqList(tpAniSirGlobal pMac, tCsrPeStatsReqInf
             }
             else
             {
-               // the timer could not be stopped. Hence destroy and free the 
+               // the timer could not be stopped. Hence destroy and free the
                // memory for the PE stat entry in the timer CB.
                pTempStaEntry->timerStopFailed = TRUE;
             }
-         } 
+         }
 
          if(csrLLRemoveEntry(&pMac->roam.peStatsReqList, pEntry, LL_ACCESS_LOCK))
          {
@@ -16284,7 +16290,7 @@ void csrRoamSaveStatsFromTl(tpAniSirGlobal pMac, WLANTL_TRANSFER_STA_TYPE *pTlSt
 
 }
 
-void csrRoamReportStatistics(tpAniSirGlobal pMac, tANI_U32 statsMask, 
+void csrRoamReportStatistics(tpAniSirGlobal pMac, tANI_U32 statsMask,
                              tCsrStatsCallback callback, tANI_U8 staId, void *pContext)
 {
    tANI_U8 stats[500];
@@ -16378,7 +16384,7 @@ eHalStatus csrRoamDeregStatisticsReq(tpAniSirGlobal pMac)
       {
          pTempStaEntry = GET_BASE_ADDR( pPrevEntry, tCsrStatsClientReqInfo, link );
          //send up the stats report
-         csrRoamReportStatistics(pMac, pTempStaEntry->statsMask, pTempStaEntry->callback, 
+         csrRoamReportStatistics(pMac, pTempStaEntry->statsMask, pTempStaEntry->callback,
                                  pTempStaEntry->staId, pTempStaEntry->pContext);
          csrRoamRemoveStatListEntry(pMac, pPrevEntry);
       }
@@ -16392,7 +16398,7 @@ eHalStatus csrRoamDeregStatisticsReq(tpAniSirGlobal pMac)
             csrRoamRemoveEntryFromPeStatsReqList(pMac, pTempStaEntry->pPeStaEntry);
          }
       }
-      //check if we need to stop the tl stats timer too 
+      //check if we need to stop the tl stats timer too
       pMac->roam.tlStatsReqInfo.numClient--;
       if(!pMac->roam.tlStatsReqInfo.numClient)
       {
@@ -16411,19 +16417,19 @@ eHalStatus csrRoamDeregStatisticsReq(tpAniSirGlobal pMac)
       if (pTempStaEntry->periodicity)
       {
           //While creating StaEntry in csrGetStatistics,
-          //Initializing and starting timer only when periodicity is set. 
+          //Initializing and starting timer only when periodicity is set.
           //So Stop and Destroy timer only when periodicity is set.
-          
+
           vos_timer_stop( &pTempStaEntry->timer );
-          // Destroy the vos timer...      
+          // Destroy the vos timer...
           vosStatus = vos_timer_destroy( &pTempStaEntry->timer );
           if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
           {
               smsLog(pMac, LOGE, FL("csrRoamDeregStatisticsReq:failed to destroy Client req timer"));
           }
       }
-      
-      
+
+
       pPrevEntry = pEntry;
       pEntry = csrLLNext( &pMac->roam.statsClientReqList, pEntry, LL_ACCESS_NOLOCK );
    }
@@ -16432,15 +16438,15 @@ eHalStatus csrRoamDeregStatisticsReq(tpAniSirGlobal pMac)
    {
       pTempStaEntry = GET_BASE_ADDR( pPrevEntry, tCsrStatsClientReqInfo, link );
       //send up the stats report
-      csrRoamReportStatistics(pMac, pTempStaEntry->statsMask, pTempStaEntry->callback, 
+      csrRoamReportStatistics(pMac, pTempStaEntry->statsMask, pTempStaEntry->callback,
                                  pTempStaEntry->staId, pTempStaEntry->pContext);
       csrRoamRemoveStatListEntry(pMac, pPrevEntry);
    }
    return status;
-   
+
 }
 
-eHalStatus csrIsFullPowerNeeded( tpAniSirGlobal pMac, tSmeCmd *pCommand, 
+eHalStatus csrIsFullPowerNeeded( tpAniSirGlobal pMac, tSmeCmd *pCommand,
                                    tRequestFullPowerReason *pReason,
                                    tANI_BOOLEAN *pfNeedPower )
 {
@@ -16532,12 +16538,12 @@ eHalStatus csrIsFullPowerNeeded( tpAniSirGlobal pMac, tSmeCmd *pCommand,
 #if 0
                                                 // TODO : Session Specific info pConnectBssDesc
                         if( csrIsBssIdEqual( pMac, &pScanResult->Result.BssDescriptor, pMac->roam.pConnectBssDesc ) &&
-                            csrIsSsidEqual( pMac, pMac->roam.pConnectBssDesc, 
+                            csrIsSsidEqual( pMac, pMac->roam.pConnectBssDesc,
                                             &pScanResult->Result.BssDescriptor, (tDot11fBeaconIEs *)( pScanResult->Result.pvIes ) ) )
                         {
                             // Check to see if the Auth type has changed in the Profile.  If so, we don't want to Reassociate
-                            // with Authenticating first.  To force this, stop the current association (Disassociate) and 
-                            // then re 'Join' the AP, wihch will force an Authentication (with the new Auth type) followed by 
+                            // with Authenticating first.  To force this, stop the current association (Disassociate) and
+                            // then re 'Join' the AP, wihch will force an Authentication (with the new Auth type) followed by
                             // a new Association.
                             if(csrIsSameProfile(pMac, &pMac->roam.connectedProfile, pProfile))
                             {
@@ -16569,7 +16575,7 @@ eHalStatus csrIsFullPowerNeeded( tpAniSirGlobal pMac, tSmeCmd *pCommand,
 #ifdef FEATURE_WLAN_TDLS
         else if( eSmeCommandTdlsAddPeer == pCommand->command )
         {
-            //TDLS link is getting established. need full power 
+            //TDLS link is getting established. need full power
             fNeedFullPower = eANI_BOOLEAN_TRUE;
             reason = eSME_FULL_PWR_NEEDED_BY_TDLS_PEER_SETUP;
         }
@@ -16860,7 +16866,7 @@ eHalStatus csrRoamUpdateAPWPSIE( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirAP
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tSirUpdateAPWPSIEsReq *pMsg;
     tANI_U8 *pBuf = NULL, *wTmpBuf = NULL;
-    
+
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
     if (NULL == pSession)
     {
@@ -16938,7 +16944,7 @@ eHalStatus csrRoamUpdateWPARSNIEs( tpAniSirGlobal pMac, tANI_U32 sessionId, tSir
         pBuf += sizeof(tSirMacAddr);
         // sessionId
         *pBuf++ = (tANI_U8)sessionId;
-    
+
         // APWPARSNIEs
         vos_mem_copy((tSirRSNie *)pBuf, pAPSirRSNie, sizeof(tSirRSNie));
         pBuf += sizeof(tSirRSNie);
@@ -16980,7 +16986,7 @@ eHalStatus csrRoamIssueFTPreauthReq(tHalHandle hHal, tANI_U32 sessionId, tpSirBs
                  (void *)pBssDescription->bssId, sizeof(tSirMacAddr));
 
 #ifdef WLAN_FEATURE_VOWIFI_11R
-    if (csrRoamIs11rAssoc(pMac) && 
+    if (csrRoamIs11rAssoc(pMac) &&
           (pMac->roam.roamSession[sessionId].connectedProfile.AuthType != eCSR_AUTH_TYPE_OPEN_SYSTEM))
     {
         pftPreAuthReq->ft_ies_length = (tANI_U16)pMac->ft.ftSmeContext.auth_ft_ies_length;
@@ -16990,17 +16996,17 @@ eHalStatus csrRoamIssueFTPreauthReq(tHalHandle hHal, tANI_U32 sessionId, tpSirBs
     else
 #endif
     {
-        pftPreAuthReq->ft_ies_length = 0; 
+        pftPreAuthReq->ft_ies_length = 0;
     }
     vos_mem_copy(pftPreAuthReq->pbssDescription, pBssDescription,
                  sizeof(pBssDescription->length) + pBssDescription->length);
-    pftPreAuthReq->length = pal_cpu_to_be16(auth_req_len); 
+    pftPreAuthReq->length = pal_cpu_to_be16(auth_req_len);
     return palSendMBMessage(pMac->hHdd, pftPreAuthReq);
 }
 /*--------------------------------------------------------------------------
- * This will receive and process the FT Pre Auth Rsp from the current 
- * associated ap. 
- * 
+ * This will receive and process the FT Pre Auth Rsp from the current
+ * associated ap.
+ *
  * This will invoke the hdd call back. This is so that hdd can now
  * send the FTIEs from the Auth Rsp (Auth Seq 2) to the supplicant.
   ------------------------------------------------------------------------*/
@@ -17037,7 +17043,7 @@ void csrRoamFTPreAuthRspProcessor( tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuth
     {
         sme_QosCsrEventInd(pMac, pMac->ft.ftSmeContext.smeSessionId, SME_QOS_CSR_PREAUTH_SUCCESS_IND, NULL);
     }
-    /* Start the pre-auth reassoc interval timer with a period of 400ms. When this expires, 
+    /* Start the pre-auth reassoc interval timer with a period of 400ms. When this expires,
      * actual transition from the current to handoff AP is triggered */
     status = vos_timer_start(&pMac->ft.ftSmeContext.preAuthReassocIntvlTimer,
                                                             60);
@@ -17050,7 +17056,7 @@ void csrRoamFTPreAuthRspProcessor( tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuth
     vos_mem_copy((void *)&pMac->ft.ftSmeContext.preAuthbssId,
                  (void *)pFTPreAuthRsp->preAuthbssId, sizeof(tCsrBssid));
     if (csrRoamIs11rAssoc(pMac))
-       csrRoamCallCallback(pMac, pFTPreAuthRsp->smeSessionId, NULL, 0, 
+       csrRoamCallCallback(pMac, pFTPreAuthRsp->smeSessionId, NULL, 0,
                         eCSR_ROAM_FT_RESPONSE, eCSR_ROAM_RESULT_NONE);
 
 #if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
@@ -17067,11 +17073,11 @@ void csrRoamFTPreAuthRspProcessor( tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuth
 #endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
 
 #ifdef FEATURE_WLAN_LFR
-    // If Legacy Fast Roaming is enabled, signal the supplicant  
+    // If Legacy Fast Roaming is enabled, signal the supplicant
     // So he can send us a PMK-ID for this candidate AP.
     if (csrRoamIsFastRoamEnabled(pMac, CSR_SESSION_ID_INVALID))
     {
-        // Save the bssid from the received response 
+        // Save the bssid from the received response
         vos_mem_copy((void *)&roamInfo.bssid,
                      (void *)pFTPreAuthRsp->preAuthbssId, sizeof(tCsrBssid));
         csrRoamCallCallback(pMac, pFTPreAuthRsp->smeSessionId, &roamInfo, 0, eCSR_ROAM_PMK_NOTIFY, 0);
@@ -17090,7 +17096,7 @@ void csrRoamJoinRetryTimerHandler(void *pv)
     tpAniSirGlobal pMac = pInfo->pMac;
     tANI_U32 sessionId = pInfo->sessionId;
     tCsrRoamSession *pSession;
-    
+
     if( CSR_IS_SESSION_VALID(pMac, sessionId) )
     {
         smsLog( pMac, LOGE, FL( "  retrying the last roam profile on session %d" ), sessionId );
@@ -17108,7 +17114,7 @@ eHalStatus csrRoamStartJoinRetryTimer(tpAniSirGlobal pMac, tANI_U32 sessionId, t
 {
     eHalStatus status = eHAL_STATUS_FAILURE;
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
-    
+
     if(pSession->pCurRoamProfile && pSession->maxRetryCount)
     {
         smsLog(pMac, LOGE, FL(" call sessionId %d retry count %d left"), sessionId, pSession->maxRetryCount);
@@ -17126,7 +17132,7 @@ eHalStatus csrRoamStartJoinRetryTimer(tpAniSirGlobal pMac, tANI_U32 sessionId, t
         smsLog(pMac, LOGE, FL(" not to start timer due to no profile or reach mac ret (%d)"),
                pSession->maxRetryCount);
     }
-    
+
     return (status);
 }
 eHalStatus csrRoamStopJoinRetryTimer(tpAniSirGlobal pMac, tANI_U32 sessionId)
@@ -17136,7 +17142,7 @@ eHalStatus csrRoamStopJoinRetryTimer(tpAniSirGlobal pMac, tANI_U32 sessionId)
     {
         return (vos_timer_stop(&pMac->roam.roamSession[sessionId].hTimerJoinRetry));
     }
-    
+
     return eHAL_STATUS_SUCCESS;
 }
 #endif
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index f27022edb2bd..1fe12364d7fd 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -60,7 +60,7 @@ tDblLinkList *g_pchannelPowerInfoList24 = NULL, * g_pchannelPowerInfoList5 = NUL
 tpAniSirGlobal g_pMac;
 #endif
 
-/* Purpose of HIDDEN_TIMER 
+/* Purpose of HIDDEN_TIMER
 ** When we remove hidden ssid from the profile i.e., forget the SSID via GUI that SSID shouldn't see in the profile
 ** For above requirement we used timer limit, logic is explained below
 ** Timer value is initialsed to current time  when it receives corresponding probe response of hidden SSID (The probe request is
@@ -68,22 +68,22 @@ tpAniSirGlobal g_pMac;
 ** for broadcast probe request, during update SSID with saved SSID we will diff current time with saved SSID time if it is greater than 1 min
 ** then we are not updating with old one
 */
-                                                                     
-#define HIDDEN_TIMER (1*60*1000)                                                                     
+
+#define HIDDEN_TIMER (1*60*1000)
 #define CSR_SCAN_RESULT_RSSI_WEIGHT     80 // must be less than 100, represent the persentage of new RSSI
-                                                                     
+
 /*---------------------------------------------------------------------------
   PER filter constant fraction: it is a %
----------------------------------------------------------------------------*/  
+---------------------------------------------------------------------------*/
 #define CSR_SCAN_PER_FILTER_FRAC 100
-                                                                     
+
 /*---------------------------------------------------------------------------
   RSSI filter constant fraction: it is a %
----------------------------------------------------------------------------*/  
+---------------------------------------------------------------------------*/
 #define CSR_SCAN_RSSI_FILTER_FRAC 100
 
 /*---------------------------------------------------------------------------
-Convert RSSI into overall score: Since RSSI is in -dBm values, and the 
+Convert RSSI into overall score: Since RSSI is in -dBm values, and the
 overall needs to be weighted inversely (where greater value means better
 system), we convert.
 RSSI *cannot* be more than 0xFF or less than 0 for meaningful WLAN operation
@@ -96,7 +96,7 @@ RSSI *cannot* be more than 0xFF or less than 0 for meaningful WLAN operation
 #define CSR_SCAN_OVERALL_SCORE( rssi )                          \
     (( rssi < CSR_SCAN_MAX_SCORE_VAL )                          \
      ? (CSR_SCAN_MAX_SCORE_VAL-rssi) : CSR_SCAN_MIN_SCORE_VAL)
-                                                                     
+
 
 #define CSR_SCAN_IS_OVER_BSS_LIMIT(pMac)  \
    ( (pMac)->scan.nBssLimit <= (csrLLCount(&(pMac)->scan.scanResultList)) )
@@ -150,8 +150,8 @@ void csrPurgeChannelPower( tpAniSirGlobal pMac, tDblLinkList *pChannelList );
 eHalStatus csrSetCfgBackgroundScanPeriod(tpAniSirGlobal pMac, tANI_U32 bgPeriod);
 eHalStatus csrProcessSetBGScanParam(tpAniSirGlobal pMac, tSmeCmd *pCommand);
 void csrReleaseScanCommand(tpAniSirGlobal pMac, tSmeCmd *pCommand, eCsrScanStatus scanStatus);
-static tANI_BOOLEAN csrScanValidateScanResult( tpAniSirGlobal pMac, tANI_U8 *pChannels, 
-                                               tANI_U8 numChn, tSirBssDescription *pBssDesc, 
+static tANI_BOOLEAN csrScanValidateScanResult( tpAniSirGlobal pMac, tANI_U8 *pChannels,
+                                               tANI_U8 numChn, tSirBssDescription *pBssDesc,
                                                tDot11fBeaconIEs **ppIes );
 eHalStatus csrSetBGScanChannelList( tpAniSirGlobal pMac, tANI_U8 *pAdjustChannels, tANI_U8 NumAdjustChannels);
 void csrReleaseCmdSingle(tpAniSirGlobal pMac, tSmeCmd *pCommand);
@@ -196,17 +196,17 @@ static eHalStatus csrLLScanPurgeResult(tpAniSirGlobal pMac, tDblLinkList *pList)
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tListElem *pEntry;
     tCsrScanResult *pBssDesc;
-    
+
     csrLLLock(pList);
-    
+
     while((pEntry = csrLLRemoveHead(pList, LL_ACCESS_NOLOCK)) != NULL)
     {
         pBssDesc = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
         csrFreeScanResultEntry( pMac, pBssDesc );
     }
-    
-    csrLLUnlock(pList);   
-     
+
+    csrLLUnlock(pList);
+
     return (status);
 }
 
@@ -281,7 +281,7 @@ int csrCheckValidateLists(void * dest, const void *src, v_SIZE_t num, int idx)
 eHalStatus csrScanOpen( tpAniSirGlobal pMac )
 {
     eHalStatus status;
-    
+
     do
     {
         csrLLOpen(pMac->hHdd, &pMac->scan.scanResultList);
@@ -311,7 +311,7 @@ eHalStatus csrScanOpen( tpAniSirGlobal pMac )
             smsLog(pMac, LOGE, FL("cannot allocate memory for hTimerStaApConcTimer timer"));
             break;
         }
-#endif        
+#endif
         status = vos_timer_init(&pMac->scan.hTimerIdleScan, VOS_TIMER_TYPE_SW, csrScanIdleScanTimerHandler, pMac);
         if (!HAL_STATUS_SUCCESS(status))
         {
@@ -332,7 +332,7 @@ eHalStatus csrScanOpen( tpAniSirGlobal pMac )
             break;
         }
     }while(0);
-    
+
     return (status);
 }
 
@@ -372,32 +372,32 @@ eHalStatus csrScanClose( tpAniSirGlobal pMac )
 
 eHalStatus csrScanEnable( tpAniSirGlobal pMac )
 {
-    
+
     pMac->scan.fScanEnable = eANI_BOOLEAN_TRUE;
     pMac->scan.fRestartIdleScan = eANI_BOOLEAN_TRUE;
-    
+
     return eHAL_STATUS_SUCCESS;
 }
 
 
 eHalStatus csrScanDisable( tpAniSirGlobal pMac )
 {
-    
+
     csrScanStopTimers(pMac);
     pMac->scan.fScanEnable = eANI_BOOLEAN_FALSE;
-    
+
     return eHAL_STATUS_SUCCESS;
 }
 
 
-//Set scan timing parameters according to state of other driver sessions 
-//No validation of the parameters is performed. 
+//Set scan timing parameters according to state of other driver sessions
+//No validation of the parameters is performed.
 static void csrSetDefaultScanTiming( tpAniSirGlobal pMac, tSirScanType scanType, tCsrScanRequest *pScanRequest)
 {
 #ifdef WLAN_AP_STA_CONCURRENCY
     if(csrIsAnySessionConnected(pMac))
     {
-        //If multi-session, use the appropriate default scan times 
+        //If multi-session, use the appropriate default scan times
         if(scanType == eSIR_ACTIVE_SCAN)
         {
             pScanRequest->maxChnTime = pMac->roam.configParam.nActiveMaxChnTimeConc;
@@ -412,7 +412,7 @@ static void csrSetDefaultScanTiming( tpAniSirGlobal pMac, tSirScanType scanType,
         pScanRequest->minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
 
         pScanRequest->restTime = pMac->roam.configParam.nRestTimeConc;
-        
+
         //Return so that fields set above will not be overwritten.
         return;
     }
@@ -441,7 +441,7 @@ static void csrSetDefaultScanTiming( tpAniSirGlobal pMac, tSirScanType scanType,
 }
 
 #ifdef WLAN_AP_STA_CONCURRENCY
-//Return SUCCESS is the command is queued, else returns eHAL_STATUS_FAILURE 
+//Return SUCCESS is the command is queued, else returns eHAL_STATUS_FAILURE
 eHalStatus csrQueueScanRequest( tpAniSirGlobal pMac, tSmeCmd *pScanCmd )
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -458,7 +458,7 @@ eHalStatus csrQueueScanRequest( tpAniSirGlobal pMac, tSmeCmd *pScanCmd )
     /* split scan if any one of the following:
      * - STA session is connected and the scan is not a P2P search
      * - any P2P session is connected
-     * Do not split scans if no concurrent infra connections are 
+     * Do not split scans if no concurrent infra connections are
      * active and if the scan is a BG scan triggered by LFR (OR)
      * any scan if LFR is in the middle of a BG scan. Splitting
      * the scan is delaying the time it takes for LFR to find
@@ -474,11 +474,11 @@ eHalStatus csrQueueScanRequest( tpAniSirGlobal pMac, tSmeCmd *pScanCmd )
     {
       nNumChanCombinedConc = pMac->roam.configParam.nNumP2PChanCombinedConc;
     }
-    if ( (csrIsStaSessionConnected(pMac) && 
+    if ( (csrIsStaSessionConnected(pMac) &&
 #ifdef FEATURE_WLAN_LFR
          (csrIsConcurrentInfraConnected(pMac) ||
           ((pScanCmd->u.scanCmd.reason != eCsrScanBgScan) &&
-           (pMac->roam.neighborRoamInfo.neighborRoamState != 
+           (pMac->roam.neighborRoamInfo.neighborRoamState !=
             eCSR_NEIGHBOR_ROAM_STATE_CFG_CHAN_LIST_SCAN))) &&
 #endif
          (pScanCmd->u.scanCmd.u.scanRequest.p2pSearch != 1)) ||
@@ -623,12 +623,12 @@ eHalStatus csrQueueScanRequest( tpAniSirGlobal pMac, tSmeCmd *pScanCmd )
         if( fNoCmdPending )
         {
             if (pQueueScanCmd != NULL)
-            {            
+            {
                 csrLLInsertTail( &pMac->scan.scanCmdPendingList, &pQueueScanCmd->Link, LL_ACCESS_LOCK );
             }
 
             if (pSendScanCmd != NULL)
-            {            
+            {
                 return csrQueueSmeCommand(pMac, pSendScanCmd, eANI_BOOLEAN_FALSE);
             }
         }
@@ -649,7 +649,7 @@ eHalStatus csrQueueScanRequest( tpAniSirGlobal pMac, tSmeCmd *pScanCmd )
     {  //No concurrency case
         smsLog( pMac, LOG2, FL("Queuing scan command (reason=%d, roamState=%d"
                 " numOfChannels=%d)"),
-                pScanCmd->u.scanCmd.reason, 
+                pScanCmd->u.scanCmd.reason,
                 pMac->roam.neighborRoamInfo.neighborRoamState,
                 pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels);
         return csrQueueSmeCommand(pMac, pScanCmd, eANI_BOOLEAN_FALSE);
@@ -661,14 +661,14 @@ eHalStatus csrQueueScanRequest( tpAniSirGlobal pMac, tSmeCmd *pScanCmd )
 
 /* ---------------------------------------------------------------------------
     \fn csrScan2GOnyRequest
-    \brief This function will update the scan request with only 
+    \brief This function will update the scan request with only
            2.4GHz valid channel list.
     \param pMac
     \param pScanCmd
     \param pScanRequest
     \return None
   -------------------------------------------------------------------------------*/
-static void csrScan2GOnyRequest(tpAniSirGlobal pMac,tSmeCmd *pScanCmd, 
+static void csrScan2GOnyRequest(tpAniSirGlobal pMac,tSmeCmd *pScanCmd,
                                 tCsrScanRequest *pScanRequest)
 {
     tANI_U8 index, channelId, channelListSize = 0;
@@ -678,10 +678,10 @@ static void csrScan2GOnyRequest(tpAniSirGlobal pMac,tSmeCmd *pScanCmd,
     VOS_ASSERT(pScanCmd && pScanRequest);
     /* To silence the KW tool null check is added */
     if((pScanCmd == NULL) || (pScanRequest == NULL))
-    { 
+    {
         smsLog( pMac, LOGE, FL(" pScanCmd or pScanRequest is NULL "));
         return;
-    }    
+    }
 
     if (pScanCmd->u.scanCmd.scanID ||
        (eCSR_SCAN_REQUEST_FULL_SCAN != pScanRequest->requestType))
@@ -701,14 +701,14 @@ static void csrScan2GOnyRequest(tpAniSirGlobal pMac,tSmeCmd *pScanCmd,
     pScanRequest->ChannelInfo.ChannelList = validchannelList;
 }
 
-eHalStatus csrScanRequest(tpAniSirGlobal pMac, tANI_U16 sessionId, 
-              tCsrScanRequest *pScanRequest, tANI_U32 *pScanRequestID, 
+eHalStatus csrScanRequest(tpAniSirGlobal pMac, tANI_U16 sessionId,
+              tCsrScanRequest *pScanRequest, tANI_U32 *pScanRequestID,
               csrScanCompleteCallback callback, void *pContext)
 {
     eHalStatus status = eHAL_STATUS_FAILURE;
     tSmeCmd *pScanCmd = NULL;
     eCsrConnectState ConnectState;
-    
+
     if(pScanRequest == NULL)
     {
         smsLog( pMac, LOGE, FL(" pScanRequest is NULL"));
@@ -744,7 +744,7 @@ eHalStatus csrScanRequest(tpAniSirGlobal pMac, tANI_U16 sessionId,
             if(pScanCmd)
             {
                 vos_mem_set(&pScanCmd->u.scanCmd, sizeof(tScanCmd), 0);
-                pScanCmd->command = eSmeCommandScan; 
+                pScanCmd->command = eSmeCommandScan;
                 pScanCmd->sessionId = sessionId;
                 pScanCmd->u.scanCmd.callback = callback;
                 pScanCmd->u.scanCmd.pContext = pContext;
@@ -816,26 +816,26 @@ eHalStatus csrScanRequest(tpAniSirGlobal pMac, tANI_U16 sessionId,
                 {
                     pScanRequest->maxChnTime = pScanRequest->maxChnTime << 1;
                     pScanRequest->minChnTime = pScanRequest->minChnTime << 1;
-                }  
+                }
 
                 pScanRequest->maxChnTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
                 pScanRequest->minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
                 //Need to make the following atomic
                 pScanCmd->u.scanCmd.scanID = pMac->scan.nextScanID++; //let it wrap around
-                
+
                 if(pScanRequestID)
                 {
-                    *pScanRequestID = pScanCmd->u.scanCmd.scanID; 
+                    *pScanRequestID = pScanCmd->u.scanCmd.scanID;
                 }
 
-                // If it is the first scan request from HDD, CSR checks if it is for 11d. 
-                // If it is not, CSR will save the scan request in the pending cmd queue 
+                // If it is the first scan request from HDD, CSR checks if it is for 11d.
+                // If it is not, CSR will save the scan request in the pending cmd queue
                 // & issue an 11d scan request to PE.
                 if (((0 == pScanCmd->u.scanCmd.scanID)
                    && (eCSR_SCAN_REQUEST_11D_SCAN != pScanRequest->requestType))
 #ifdef SOFTAP_CHANNEL_RANGE
                    && (eCSR_SCAN_SOFTAP_CHANNEL_RANGE != pScanRequest->requestType)
-#endif                   
+#endif
                    && (eANI_BOOLEAN_FALSE == pMac->scan.fEnableBypass11d)
                    )
                 {
@@ -867,7 +867,7 @@ eHalStatus csrScanRequest(tpAniSirGlobal pMac, tANI_U16 sessionId,
                         p11dScanCmd->command = eSmeCommandScan;
                         p11dScanCmd->u.scanCmd.callback = NULL;
                         p11dScanCmd->u.scanCmd.pContext = NULL;
-                        p11dScanCmd->u.scanCmd.scanID = pMac->scan.nextScanID++;                
+                        p11dScanCmd->u.scanCmd.scanID = pMac->scan.nextScanID++;
                         scanReq.BSSType = eCSR_BSS_TYPE_ANY;
 
                         if ( csrIs11dSupported(pMac) )
@@ -916,14 +916,14 @@ eHalStatus csrScanRequest(tpAniSirGlobal pMac, tANI_U16 sessionId,
                                                             eANI_BOOLEAN_FALSE);
 #else
                             status = csrQueueSmeCommand(pMac, p11dScanCmd, eANI_BOOLEAN_FALSE);
-#endif                   
+#endif
                             if( !HAL_STATUS_SUCCESS( status ) )
                             {
                                 smsLog( pMac, LOGE, FL(" fail to send message status = %d"), status );
                                 break;
                             }
                         }
-                        else 
+                        else
                         {
                             break;
                         }
@@ -955,7 +955,7 @@ eHalStatus csrScanRequest(tpAniSirGlobal pMac, tANI_U16 sessionId,
                         status = csrQueueSmeCommand(pMac, pScanCmd,
                                                     eANI_BOOLEAN_FALSE);
 #else
-                    status = csrQueueSmeCommand(pMac, pScanCmd, eANI_BOOLEAN_FALSE);                   
+                    status = csrQueueSmeCommand(pMac, pScanCmd, eANI_BOOLEAN_FALSE);
 #endif
                     if( !HAL_STATUS_SUCCESS( status ) )
                     {
@@ -963,13 +963,13 @@ eHalStatus csrScanRequest(tpAniSirGlobal pMac, tANI_U16 sessionId,
                         break;
                     }
                 }
-                else 
+                else
                 {
                     smsLog( pMac, LOGE, FL(" fail to copy request status = %d"), status );
                     break;
                 }
             }
-            else 
+            else
             {
                 smsLog( pMac, LOGE, FL(" pScanCmd is NULL"));
                 break;
@@ -995,7 +995,7 @@ eHalStatus csrScanRequestResult(tpAniSirGlobal pMac)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tSmeCmd *pScanCmd;
-    
+
     if(pMac->scan.fScanEnable)
     {
         pScanCmd = csrGetCommandBuffer(pMac);
@@ -1015,14 +1015,14 @@ eHalStatus csrScanRequestResult(tpAniSirGlobal pMac)
                 csrReleaseCommandScan(pMac, pScanCmd);
             }
         }
-        else 
+        else
         {
             //log error
             smsLog(pMac, LOGE, FL("can not obtain a common buffer"));
             status = eHAL_STATUS_RESOURCES;
         }
     }
-    
+
     return (status);
 }
 
@@ -1079,9 +1079,9 @@ eHalStatus csrScanAllChannels(tpAniSirGlobal pMac, eCsrRequestType reqType)
     scanReq.minChnTime = pMac->roam.configParam.nActiveMinChnTime;
     scanReq.maxChnTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
     scanReq.minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
-    //Scan with invalid sessionId. 
+    //Scan with invalid sessionId.
     //This results in SME using the first available session to scan.
-    status = csrScanRequest(pMac, CSR_SESSION_ID_INVALID, &scanReq, 
+    status = csrScanRequest(pMac, CSR_SESSION_ID_INVALID, &scanReq,
                             &scanId, NULL, NULL);
 
     return (status);
@@ -1156,7 +1156,7 @@ eHalStatus csrIssueRoamAfterLostlinkScan(tpAniSirGlobal pMac, tANI_U32 sessionId
                     //we want to put the last connected BSS to the very beginning, if possible
                     csrMoveBssToHeadFromBSSID(pMac, &pSession->connectedProfile.bssid, hBSSList);
                 }
-                status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList, reason, 
+                status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList, reason,
                                                 roamId, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_TRUE);
                 if(!HAL_STATUS_SUCCESS(status))
                 {
@@ -1182,11 +1182,12 @@ eHalStatus csrIssueRoamAfterLostlinkScan(tpAniSirGlobal pMac, tANI_U32 sessionId
 
 
 eHalStatus csrScanGetScanChnInfo(tpAniSirGlobal pMac, tANI_U8 sessionId,
-                                 void *pContext, void *callback)
+                                 void *pContext, void *callback,
+                                 tANI_U32 scanID)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tSmeCmd *pScanCmd;
-    
+
     if(pMac->scan.fScanEnable)
     {
         pScanCmd = csrGetCommandBuffer(pMac);
@@ -1197,8 +1198,18 @@ eHalStatus csrScanGetScanChnInfo(tpAniSirGlobal pMac, tANI_U8 sessionId,
             pScanCmd->u.scanCmd.callback = callback;
             pScanCmd->u.scanCmd.pContext = pContext;
             pScanCmd->u.scanCmd.reason = eCsrScanGetScanChnInfo;
-            //Need to make the following atomic
-            pScanCmd->u.scanCmd.scanID = pMac->scan.nextScanID++; //let it wrap around
+            if (callback)
+            {
+                //use same scanID as maintained in pAdapter
+                pScanCmd->u.scanCmd.scanID = scanID;
+            }
+            else
+            {
+                //Need to make the following atomic
+                pScanCmd->u.scanCmd.scanID =
+                                   pMac->scan.nextScanID++; //let it wrap around
+            }
+
             pScanCmd->sessionId = sessionId;
             status = csrQueueSmeCommand(pMac, pScanCmd, eANI_BOOLEAN_FALSE);
             if( !HAL_STATUS_SUCCESS( status ) )
@@ -1207,14 +1218,14 @@ eHalStatus csrScanGetScanChnInfo(tpAniSirGlobal pMac, tANI_U8 sessionId,
                 csrReleaseCommandScan(pMac, pScanCmd);
             }
         }
-        else 
+        else
         {
             //log error
             smsLog(pMac, LOGE, FL("can not obtain a common buffer"));
             status = eHAL_STATUS_RESOURCES;
         }
     }
-    
+
     return (status);
 }
 
@@ -1244,7 +1255,7 @@ eHalStatus csrScanHandleFailedLostlink1(tpAniSirGlobal pMac, tANI_U32 sessionId)
             //try lostlink scan2
             status = csrScanRequestLostLink2(pMac, sessionId);
         }
-        else if(!pSession->pCurRoamProfile->ChannelInfo.ChannelList || 
+        else if(!pSession->pCurRoamProfile->ChannelInfo.ChannelList ||
                 pSession->pCurRoamProfile->ChannelInfo.ChannelList[0] == 0)
         {
             //go straight to lostlink scan3
@@ -1265,7 +1276,7 @@ eHalStatus csrScanHandleFailedLostlink1(tpAniSirGlobal pMac, tANI_U32 sessionId)
         status = csrScanRequestLostLink3(pMac, sessionId);
     }
 
-    return (status);    
+    return (status);
 }
 
 
@@ -1286,7 +1297,7 @@ eHalStatus csrScanHandleFailedLostlink2(tpAniSirGlobal pMac, tANI_U32 sessionId)
     {
         csrScanStartIdleScan(pMac);
     }
-    else if(!pSession->pCurRoamProfile || !pSession->pCurRoamProfile->ChannelInfo.ChannelList || 
+    else if(!pSession->pCurRoamProfile || !pSession->pCurRoamProfile->ChannelInfo.ChannelList ||
                 pSession->pCurRoamProfile->ChannelInfo.ChannelList[0] == 0)
     {
         //try lostlink scan3
@@ -1301,7 +1312,7 @@ eHalStatus csrScanHandleFailedLostlink2(tpAniSirGlobal pMac, tANI_U32 sessionId)
         }
     }
 
-    return (status);    
+    return (status);
 }
 
 
@@ -1316,8 +1327,8 @@ eHalStatus csrScanHandleFailedLostlink3(tpAniSirGlobal pMac, tANI_U32 sessionId)
         //we are done with lostlink
         csrScanStartIdleScan(pMac);
     }
-    
-    return (status);    
+
+    return (status);
 }
 
 
@@ -1417,7 +1428,7 @@ eHalStatus csrScanRequestLostLink1( tpAniSirGlobal pMac, tANI_U32 sessionId )
                 {
                     for(i = 0; i < nChn; i++)
                     {
-                        if(pCommand->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[i] == 
+                        if(pCommand->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[i] ==
                                         pScanResult->BssDescriptor.channelId)
                         {
                             break;
@@ -1433,7 +1444,7 @@ eHalStatus csrScanRequestLostLink1( tpAniSirGlobal pMac, tANI_U32 sessionId )
                 {
                     for(i = 0; i < nChn; i++)
                     {
-                        if(pCommand->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[i] == 
+                        if(pCommand->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[i] ==
                                         pSession->connectedProfile.operationChannel)
                         {
                             break;
@@ -1461,7 +1472,7 @@ eHalStatus csrScanRequestLostLink1( tpAniSirGlobal pMac, tANI_U32 sessionId )
                         pCommand->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[0] = pSession->connectedProfile.operationChannel;
                         pCommand->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels = 1;
                     }
-                    else 
+                    else
                     {
                         break;
                     }
@@ -1578,7 +1589,7 @@ eHalStatus csrScanRequestLostLink2( tpAniSirGlobal pMac, tANI_U32 sessionId )
                 {
                     for(i = 0; i < nChn; i++)
                     {
-                        if(pCommand->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[i] == 
+                        if(pCommand->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[i] ==
                                         pScanResult->BssDescriptor.channelId)
                         {
                             break;
@@ -1725,7 +1736,7 @@ eHalStatus csrScanHandleSearchForSSID(tpAniSirGlobal pMac, tSmeCmd *pCommand)
         status = csrScanGetResult(pMac, pScanFilter, &hBSSList);
         if(!HAL_STATUS_SUCCESS(status))
             break;
-        status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued, 
+        status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued,
                                     pCommand->u.scanCmd.roamId, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_TRUE);
         if(!HAL_STATUS_SUCCESS(status))
         {
@@ -1810,7 +1821,7 @@ eHalStatus csrScanHandleSearchForSSIDFailure(tpAniSirGlobal pMac, tSmeCmd *pComm
     //Check whether it is for start ibss. No need to do anything if it is a JOIN request
     if(pProfile && CSR_IS_START_IBSS(pProfile))
     {
-        status = csrRoamIssueConnect(pMac, sessionId, pProfile, NULL, eCsrHddIssued, 
+        status = csrRoamIssueConnect(pMac, sessionId, pProfile, NULL, eCsrHddIssued,
                                         pCommand->u.scanCmd.roamId, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_TRUE);
         if(!HAL_STATUS_SUCCESS(status))
         {
@@ -1818,7 +1829,7 @@ eHalStatus csrScanHandleSearchForSSIDFailure(tpAniSirGlobal pMac, tSmeCmd *pComm
             csrRoamCallCallback(pMac, sessionId, NULL, pCommand->u.scanCmd.roamId, eCSR_ROAM_FAILED, eCSR_ROAM_RESULT_FAILURE);
         }
     }
-    else 
+    else
     {
         eCsrRoamResult roamResult = eCSR_ROAM_RESULT_FAILURE;
 
@@ -1837,7 +1848,7 @@ eHalStatus csrScanHandleSearchForSSIDFailure(tpAniSirGlobal pMac, tSmeCmd *pComm
                 pRoamInfo = &roamInfo;
                 if(pCommand->u.roamCmd.pRoamBssEntry)
                 {
-                    tCsrScanResult *pScanResult = 
+                    tCsrScanResult *pScanResult =
                                 GET_BASE_ADDR(pCommand->u.roamCmd.pRoamBssEntry,
                                 tCsrScanResult, Link);
                     roamInfo.pBssDesc = &pScanResult->Result.BssDescriptor;
@@ -1934,7 +1945,7 @@ eHalStatus csrScanHandleCapChangeScanComplete(tpAniSirGlobal pMac, tANI_U32 sess
             {
                 //we want to put the last connected BSS to the very beginning, if possible
                 csrMoveBssToHeadFromBSSID(pMac, &pSession->connectedProfile.bssid, hBSSList);
-                status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList, 
+                status = csrRoamIssueConnect(pMac, sessionId, pProfile, hBSSList,
                                             eCsrCapsChange, 0, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_TRUE);
                 if(!HAL_STATUS_SUCCESS(status))
                 {
@@ -1971,7 +1982,7 @@ eHalStatus csrScanResultPurge(tpAniSirGlobal pMac, tScanResultHandle hScanList)
 {
     eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
     tScanResultList *pScanList = (tScanResultList *)hScanList;
-     
+
     if(pScanList)
     {
         status = csrLLScanPurgeResult(pMac, &pScanList->List);
@@ -2066,12 +2077,12 @@ static tANI_BOOLEAN csrIsBetterBss(tCsrScanResult *pBss1, tCsrScanResult *pBss2)
 }
 
 
-#ifdef FEATURE_WLAN_LFR 
+#ifdef FEATURE_WLAN_LFR
 //Add the channel to the occupiedChannels array
 static void csrScanAddToOccupiedChannels(
-        tpAniSirGlobal pMac, 
-        tCsrScanResult *pResult, 
-        tCsrChannel *pOccupiedChannels, 
+        tpAniSirGlobal pMac,
+        tCsrScanResult *pResult,
+        tCsrChannel *pOccupiedChannels,
         tDot11fBeaconIEs *pIes)
 {
     eHalStatus status;
@@ -2084,15 +2095,15 @@ static void csrScanAddToOccupiedChannels(
     if (!csrIsChannelPresentInList(pOccupiedChannelList, numOccupiedChannels, channel)
         && csrNeighborRoamConnectedProfileMatch(pMac, pResult, pIes))
     {
-        status = csrAddToChannelListFront(pOccupiedChannelList, numOccupiedChannels, channel); 
+        status = csrAddToChannelListFront(pOccupiedChannelList, numOccupiedChannels, channel);
         if(HAL_STATUS_SUCCESS(status))
-        { 
+        {
             pOccupiedChannels->numChannels++;
             smsLog(pMac, LOG2, FL("%s: added channel %d to the list (count=%d)"),
               __func__, channel, pOccupiedChannels->numChannels);
-            if (pOccupiedChannels->numChannels > CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN) 
-                pOccupiedChannels->numChannels = CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN; 
-        } 
+            if (pOccupiedChannels->numChannels > CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN)
+                pOccupiedChannels->numChannels = CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN;
+        }
     }
 }
 #endif
@@ -2101,17 +2112,17 @@ static void csrScanAddToOccupiedChannels(
 //pIes can not be NULL
 static void csrScanAddResult(tpAniSirGlobal pMac, tCsrScanResult *pResult, tDot11fBeaconIEs *pIes)
 {
-#ifdef FEATURE_WLAN_LFR 
+#ifdef FEATURE_WLAN_LFR
     tpCsrNeighborRoamControlInfo    pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
 #endif
 
     pResult->preferValue = csrGetBssPreferValue(pMac, (int)pResult->Result.BssDescriptor.rssi);
     pResult->capValue = csrGetBssCapValue(pMac, &pResult->Result.BssDescriptor, pIes);
     csrLLInsertTail( &pMac->scan.scanResultList, &pResult->Link, LL_ACCESS_LOCK );
-#ifdef FEATURE_WLAN_LFR 
+#ifdef FEATURE_WLAN_LFR
     if(0 == pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels)
     {
-        /* Build the occupied channel list, only if "gNeighborScanChannelList" is 
+        /* Build the occupied channel list, only if "gNeighborScanChannelList" is
            NOT set in the cfg.ini file */
         csrScanAddToOccupiedChannels(pMac, pResult, &pMac->scan.occupiedChannels, pIes);
     }
@@ -2132,7 +2143,7 @@ eHalStatus csrScanGetResult(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter,
     tDot11fBeaconIEs *pIes, *pNewIes;
     tANI_BOOLEAN fMatch;
     tANI_U16 i = 0;
-    
+
     if(phResult)
     {
         *phResult = CSR_INVALID_SCANRESULT_HANDLE;
@@ -2225,10 +2236,10 @@ eHalStatus csrScanGetResult(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter,
         vos_mem_set(pRetList, sizeof(tScanResultList), 0);
         csrLLOpen(pMac->hHdd, &pRetList->List);
         pRetList->pCurEntry = NULL;
-        
+
         csrLLLock(&pMac->scan.scanResultList);
         pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_NOLOCK );
-        while( pEntry ) 
+        while( pEntry )
         {
             pBssDesc = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
             pIes = (tDot11fBeaconIEs *)( pBssDesc->Result.pvIes );
@@ -2324,7 +2335,7 @@ eHalStatus csrScanGetResult(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter,
                     //To sort the list
                     tListElem *pTmpEntry;
                     tCsrScanResult *pTmpResult;
-                    
+
                     pTmpEntry = csrLLPeekHead(&pRetList->List, LL_ACCESS_NOLOCK);
                     while(pTmpEntry)
                     {
@@ -2349,9 +2360,9 @@ eHalStatus csrScanGetResult(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter,
             pEntry = csrLLNext( &pMac->scan.scanResultList, pEntry, LL_ACCESS_NOLOCK );
         }//while
         csrLLUnlock(&pMac->scan.scanResultList);
-        
+
         smsLog(pMac, LOG2, FL("return %d BSS"), csrLLCount(&pRetList->List));
-        
+
         if( !HAL_STATUS_SUCCESS(status) || (phResult == NULL) )
         {
             //Fail or No one wants the result.
@@ -2372,7 +2383,7 @@ eHalStatus csrScanGetResult(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter,
             }
         }
     }//Allocated pRetList
-    
+
     return (status);
 }
 
@@ -2383,9 +2394,9 @@ eHalStatus csrScanGetResult(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter,
  * we are unable to recover from
  * csrRoamRoamingStateDisassocRspProcessor.
  * If it is needed to remove this routine,
- * first ensure that we recover gracefully from 
- * csrRoamRoamingStateDisassocRspProcessor if 
- * csrScanGetResult returns with a failure because 
+ * first ensure that we recover gracefully from
+ * csrRoamRoamingStateDisassocRspProcessor if
+ * csrScanGetResult returns with a failure because
  * of not being able to find the roaming BSS.
  */
 tANI_U8 csrScanFlushDenied(tpAniSirGlobal pMac)
@@ -2425,7 +2436,7 @@ eHalStatus csrScanFlushSelectiveResult(tpAniSirGlobal pMac, v_BOOL_t flushP2P)
     while( pEntry != NULL)
     {
         pBssDesc = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
-        if( flushP2P == vos_mem_compare( pBssDesc->Result.ssId.ssId, 
+        if( flushP2P == vos_mem_compare( pBssDesc->Result.ssId.ssId,
                                          "DIRECT-", 7) )
         {
             pFreeElem = pEntry;
@@ -2520,7 +2531,7 @@ eHalStatus csrScanFilter11dResult(tpAniSirGlobal pMac)
     while( pEntry )
     {
         pBssDesc = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
-        pTempEntry = csrLLNext( &pMac->scan.scanResultList, pEntry, 
+        pTempEntry = csrLLNext( &pMac->scan.scanResultList, pEntry,
                                                             LL_ACCESS_LOCK );
         if(csrCheck11dChannel(pBssDesc->Result.BssDescriptor.channelId,
                                               pMac->roam.validChannelList, len))
@@ -2546,7 +2557,7 @@ eHalStatus csrScanCopyResultList(tpAniSirGlobal pMac, tScanResultHandle hIn, tSc
     tANI_U32 count = 0;
     tListElem *pEntry;
     tANI_U32 bssLen, allocLen;
-    
+
     if(phResult)
     {
         *phResult = CSR_INVALID_SCANRESULT_HANDLE;
@@ -2561,9 +2572,9 @@ eHalStatus csrScanCopyResultList(tpAniSirGlobal pMac, tScanResultHandle hIn, tSc
         pRetList->pCurEntry = NULL;
         csrLLLock(&pMac->scan.scanResultList);
         csrLLLock(&pInList->List);
-        
+
         pEntry = csrLLPeekHead( &pInList->List, LL_ACCESS_NOLOCK );
-        while( pEntry ) 
+        while( pEntry )
         {
             pScanResult = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
             bssLen = pScanResult->Result.BssDescriptor.length + sizeof(pScanResult->Result.BssDescriptor.length);
@@ -2605,7 +2616,7 @@ eHalStatus csrScanCopyResultList(tpAniSirGlobal pMac, tScanResultHandle hIn, tSc
         }//while
         csrLLUnlock(&pInList->List);
         csrLLUnlock(&pMac->scan.scanResultList);
-        
+
         if(HAL_STATUS_SUCCESS(status))
         {
             if(0 == count)
@@ -2620,12 +2631,12 @@ eHalStatus csrScanCopyResultList(tpAniSirGlobal pMac, tScanResultHandle hIn, tSc
             }
         }
     }//Allocated pRetList
-    
+
     return (status);
 }
 
 
- 
+
 eHalStatus csrScanningStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -2637,7 +2648,7 @@ eHalStatus csrScanningStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
     }
     else
     {
-        if(pMsg->type == eWNI_SME_UPPER_LAYER_ASSOC_CNF) 
+        if(pMsg->type == eWNI_SME_UPPER_LAYER_ASSOC_CNF)
         {
             tCsrRoamSession  *pSession;
             tSirSmeAssocIndToUpperLayerCnf *pUpperLayerAssocCnf;
@@ -2658,13 +2669,13 @@ eHalStatus csrScanningStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf )
                 return eHAL_STATUS_FAILURE;
             }
 
-            pRoamInfo->statusCode = eSIR_SME_SUCCESS; //send the status code as Success 
+            pRoamInfo->statusCode = eSIR_SME_SUCCESS; //send the status code as Success
             pRoamInfo->u.pConnectedProfile = &pSession->connectedProfile;
             pRoamInfo->staId = (tANI_U8)pUpperLayerAssocCnf->aid;
             pRoamInfo->rsnIELen = (tANI_U8)pUpperLayerAssocCnf->rsnIE.length;
             pRoamInfo->prsnIE = pUpperLayerAssocCnf->rsnIE.rsnIEdata;
             pRoamInfo->addIELen = (tANI_U8)pUpperLayerAssocCnf->addIE.length;
-            pRoamInfo->paddIE = pUpperLayerAssocCnf->addIE.addIEdata;           
+            pRoamInfo->paddIE = pUpperLayerAssocCnf->addIE.addIEdata;
             vos_mem_copy(pRoamInfo->peerMac, pUpperLayerAssocCnf->peerMacAddr, sizeof(tSirMacAddr));
             vos_mem_copy(&pRoamInfo->bssid, pUpperLayerAssocCnf->bssId, sizeof(tCsrBssid));
             pRoamInfo->wmmEnabledSta = pUpperLayerAssocCnf->wmmEnabledSta;
@@ -2713,7 +2724,7 @@ void csrCheckNSaveWscIe(tpAniSirGlobal pMac, tSirBssDescription *pNewBssDescr, t
        (0 == pNewBssDescr->WscIeLen))
     {
         idx = 0;
-        len = pOldBssDescr->length - sizeof(tSirBssDescription) + 
+        len = pOldBssDescr->length - sizeof(tSirBssDescription) +
                 sizeof(tANI_U16) + sizeof(tANI_U32) - DOT11F_IE_WSCPROBERES_MIN_LEN - 2;
         pbIe = (tANI_U8 *)pOldBssDescr->ieFields;
         //Save WPS IE if it exists
@@ -2753,13 +2764,13 @@ tANI_BOOLEAN csrRemoveDupBssDescription( tpAniSirGlobal pMac, tSirBssDescription
     // results for this Bss.  In that case, remove the 'old' Bss description from the linked list.
     pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_LOCK );
 
-    while( pEntry ) 
+    while( pEntry )
     {
         pBssDesc = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
 
         // we have a duplicate scan results only when BSSID, SSID, Channel and NetworkType
         // matches
-        if ( csrIsDuplicateBssDescription( pMac, &pBssDesc->Result.BssDescriptor, 
+        if ( csrIsDuplicateBssDescription( pMac, &pBssDesc->Result.BssDescriptor,
                                                         pSirBssDescr, pIes, fForced ) )
         {
             pSirBssDescr->rssi = (tANI_S8)( (((tANI_S32)pSirBssDescr->rssi * CSR_SCAN_RESULT_RSSI_WEIGHT ) +
@@ -2772,7 +2783,7 @@ tANI_BOOLEAN csrRemoveDupBssDescription( tpAniSirGlobal pMac, tSirBssDescription
                 *pSsid = pBssDesc->Result.ssId;
                 *timer = pBssDesc->Result.timer;
                 csrCheckNSaveWscIe(pMac, pSirBssDescr, &pBssDesc->Result.BssDescriptor);
-                
+
                 csrFreeScanResultEntry( pMac, pBssDesc );
             }
             else
@@ -2819,12 +2830,12 @@ eHalStatus csrAddPMKIDCandidateList( tpAniSirGlobal pMac, tANI_U32 sessionId,
                     WLAN_VOS_DIAG_EVENT_DEF(secEvent, vos_event_wlan_security_payload_type);
                     vos_mem_set(&secEvent, sizeof(vos_event_wlan_security_payload_type), 0);
                     secEvent.eventId = WLAN_SECURITY_EVENT_PMKID_CANDIDATE_FOUND;
-                    secEvent.encryptionModeMulticast = 
+                    secEvent.encryptionModeMulticast =
                         (v_U8_t)diagEncTypeFromCSRType(pSession->connectedProfile.mcEncryptionType);
-                    secEvent.encryptionModeUnicast = 
+                    secEvent.encryptionModeUnicast =
                         (v_U8_t)diagEncTypeFromCSRType(pSession->connectedProfile.EncryptionType);
                     vos_mem_copy(secEvent.bssid, pSession->connectedProfile.bssid, 6);
-                    secEvent.authMode = 
+                    secEvent.authMode =
                         (v_U8_t)diagAuthTypeFromCSRType(pSession->connectedProfile.AuthType);
                     WLAN_VOS_DIAG_EVENT_REPORT(&secEvent, EVENT_WLAN_SECURITY);
                 }
@@ -2858,7 +2869,7 @@ eHalStatus csrAddPMKIDCandidateList( tpAniSirGlobal pMac, tANI_U32 sessionId,
 
 //This function checks whether new AP is found for the current connected profile
 //If it is found, it return the sessionId, else it return invalid sessionID
-tANI_U32 csrProcessBSSDescForPMKIDList(tpAniSirGlobal pMac, 
+tANI_U32 csrProcessBSSDescForPMKIDList(tpAniSirGlobal pMac,
                                            tSirBssDescription *pBssDesc,
                                            tDot11fBeaconIEs *pIes)
 {
@@ -2873,7 +2884,7 @@ tANI_U32 csrProcessBSSDescForPMKIDList(tpAniSirGlobal pMac,
             if( CSR_IS_SESSION_VALID( pMac, i ) )
             {
                 pSession = CSR_GET_SESSION( pMac, i );
-                if( csrIsConnStateConnectedInfra( pMac, i ) && 
+                if( csrIsConnStateConnectedInfra( pMac, i ) &&
                     ( eCSR_AUTH_TYPE_RSN == pSession->connectedProfile.AuthType ) )
                 {
                     if(csrMatchBSSToConnectProfile(pMac, &pSession->connectedProfile, pBssDesc, pIesLocal))
@@ -2963,7 +2974,7 @@ tANI_BOOLEAN csrProcessBSSDescForBKIDList(tpAniSirGlobal pMac, tSirBssDescriptio
             if( CSR_IS_SESSION_VALID( pMac, sessionId) )
             {
                 pSession = CSR_GET_SESSION( pMac, sessionId );
-                if( csrIsConnStateConnectedInfra( pMac, sessionId ) && 
+                if( csrIsConnStateConnectedInfra( pMac, sessionId ) &&
                     eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE == pSession->connectedProfile.AuthType)
                 {
                     if(csrMatchBSSToConnectProfile(pMac, &pSession->connectedProfile,pBssDesc, pIesLocal))
@@ -3052,11 +3063,11 @@ static void csrMoveTempScanResultsToMainList( tpAniSirGlobal pMac, tANI_U8 reaso
         if ( !fDupBss )
         {
             //Found a new BSS
-            sessionId = csrProcessBSSDescForPMKIDList(pMac, 
+            sessionId = csrProcessBSSDescForPMKIDList(pMac,
                              &pBssDescription->Result.BssDescriptor, pIesLocal);
             if( CSR_SESSION_ID_INVALID != sessionId)
             {
-                csrRoamCallCallback(pMac, sessionId, NULL, 0, 
+                csrRoamCallCallback(pMac, sessionId, NULL, 0,
                            eCSR_ROAM_SCAN_FOUND_NEW_BSS, eCSR_ROAM_RESULT_NONE);
             }
         }
@@ -3065,11 +3076,11 @@ static void csrMoveTempScanResultsToMainList( tpAniSirGlobal pMac, tANI_U8 reaso
             //Check if the new one has SSID it it, if not, use the older SSID if it exists.
             if( (0 == pBssDescription->Result.ssId.length) && tmpSsid.length )
             {
-                //New BSS has a hidden SSID and old one has the SSID. Keep the SSID only 
+                //New BSS has a hidden SSID and old one has the SSID. Keep the SSID only
                 //if diff of saved SSID time and current time is less than 1 min to avoid
                 //side effect of saving SSID with old one is that if AP changes its SSID while remain
-                //hidden, we may never see it and also to address the requirement of 
-                //When we remove hidden ssid from the profile i.e., forget the SSID via 
+                //hidden, we may never see it and also to address the requirement of
+                //When we remove hidden ssid from the profile i.e., forget the SSID via
                 // GUI that SSID shouldn't see in the profile
                 if( (vos_timer_get_system_time() - timer) <= HIDDEN_TIMER)
                 {
@@ -3118,7 +3129,7 @@ static void csrMoveTempScanResultsToMainList( tpAniSirGlobal pMac, tANI_U8 reaso
         }
 
 
-        
+
         // append to main list
         csrScanAddResult(pMac, pBssDescription, pIesLocal);
         if ( (pBssDescription->Result.pvIes == NULL) && pIesLocal )
@@ -3199,7 +3210,7 @@ end:
     //If we can find the current 11d info in any of the scan results, or
     // a good enough AP with the 11d info from the scan results then no need to
     // get into ambiguous state
-    if(pMac->scan.fAmbiguous11dInfoFound) 
+    if(pMac->scan.fAmbiguous11dInfoFound)
     {
       if((pMac->scan.fCurrent11dInfoMatch) || (cand_Bss_rssi != -128))
       {
@@ -3252,8 +3263,8 @@ static tCsrScanResult *csrScanSaveBssDescription( tpAniSirGlobal pMac, tSirBssDe
 }
 
 // Append a Bss Description...
-tCsrScanResult *csrScanAppendBssDescription( tpAniSirGlobal pMac, 
-                                             tSirBssDescription *pSirBssDescription, 
+tCsrScanResult *csrScanAppendBssDescription( tpAniSirGlobal pMac,
+                                             tSirBssDescription *pSirBssDescription,
                                              tDot11fBeaconIEs *pIes, tANI_BOOLEAN fForced )
 {
     tCsrScanResult *pCsrBssDescription = NULL;
@@ -3276,7 +3287,7 @@ tCsrScanResult *csrScanAppendBssDescription( tpAniSirGlobal pMac,
             //When we remove hidden ssid from the profile i.e., forget the SSID via
             // GUI that SSID shouldn't see in the profile
             if((vos_timer_get_system_time()-timer) <= HIDDEN_TIMER)
-            { 
+            {
               pCsrBssDescription->Result.ssId = tmpSsid;
               pCsrBssDescription->Result.timer = timer;
             }
@@ -3294,7 +3305,7 @@ void csrPurgeChannelPower( tpAniSirGlobal pMac, tDblLinkList *pChannelList )
     tCsrChannelPowerInfo *pChannelSet;
     tListElem *pEntry;
 
-    csrLLLock(pChannelList); 
+    csrLLLock(pChannelList);
     // Remove the channel sets from the learned list and put them in the free list
     while( ( pEntry = csrLLRemoveHead( pChannelList, LL_ACCESS_NOLOCK ) ) != NULL)
     {
@@ -3310,7 +3321,7 @@ void csrPurgeChannelPower( tpAniSirGlobal pMac, tDblLinkList *pChannelList )
 
 
 /*
- * Save the channelList into the ultimate storage as the final stage of channel 
+ * Save the channelList into the ultimate storage as the final stage of channel
  * Input: pCountryInfo -- the country code (e.g. "USI"), channel list, and power limit are all stored inside this data structure
  */
 eHalStatus csrSaveToChannelPower2G_5G( tpAniSirGlobal pMac, tANI_U32 tableSize, tSirMacChanInfo *channelTable )
@@ -3450,7 +3461,7 @@ void csrApplyChannelPowerCountryInfo( tpAniSirGlobal pMac, tCsrChannel *pChannel
             }
         }
         tempNumChannels = CSR_MIN(pChannelList->numChannels, WNI_CFG_VALID_CHANNEL_LIST_LEN);
-        /* If user doesn't want to scan the DFS channels lets trim them from 
+        /* If user doesn't want to scan the DFS channels lets trim them from
         the valid channel list*/
         for(i=0; i < tempNumChannels; i++)
         {
@@ -3505,7 +3516,7 @@ void csrApplyChannelPowerCountryInfo( tpAniSirGlobal pMac, tCsrChannel *pChannel
     {
         smsLog( pMac, LOGE, FL("  11D channel list is empty"));
     }
-    csrApplyPower2Current( pMac );     // Store the channel+power info in the global place: Cfg 
+    csrApplyPower2Current( pMac );     // Store the channel+power info in the global place: Cfg
     csrSetCfgCountryCode(pMac, countryCode);
 }
 
@@ -3902,7 +3913,7 @@ void csrSetOppositeBandChannelInfo( tpAniSirGlobal pMac )
 {
     tANI_BOOLEAN fPopulate5GBand = FALSE;
 
-    do 
+    do
     {
         // if this is not a dual band product, then we don't need to set the opposite
         // band info.  We only work in one band so no need to look in the other band.
@@ -3982,7 +3993,7 @@ tANI_U8 csrGetChannelListFromChannelSet( tpAniSirGlobal pMac, tANI_U8 *pChannelL
 
 
 //bSize -- specify the buffer size of pChannelList
-void csrConstructCurrentValidChannelList( tpAniSirGlobal pMac, tDblLinkList *pChannelSetList, 
+void csrConstructCurrentValidChannelList( tpAniSirGlobal pMac, tDblLinkList *pChannelSetList,
                                             tANI_U8 *pChannelList, tANI_U8 bSize, tANI_U8 *pNumChannels )
 {
     tListElem *pEntry;
@@ -4073,7 +4084,7 @@ tANI_BOOLEAN csrLearnCountryInformation( tpAniSirGlobal pMac, tSirBssDescription
                     }
                     else if( csrIsConnStateConnected(pMac, i))
                     {
-                        //Reach here only when the currention is base on no profile. 
+                        //Reach here only when the currention is base on no profile.
                         //User doesn't give profile and just connect to anything.
                         if(csrMatchBSSToConnectProfile(pMac, &pSession->connectedProfile, pSirBssDesc, pIesLocal))
                         {
@@ -4083,7 +4094,7 @@ tANI_BOOLEAN csrLearnCountryInformation( tpAniSirGlobal pMac, tSirBssDescription
                                    MAC_ADDR_ARRAY(pSirBssDesc->bssId));
                             //Tush
                             pMac->scan.fAmbiguous11dInfoFound = eANI_BOOLEAN_TRUE;
-                            if(csrIsBssidMatch(pMac, (tCsrBssid *)&pSirBssDesc->bssId, 
+                            if(csrIsBssidMatch(pMac, (tCsrBssid *)&pSirBssDesc->bssId,
                                                 &pSession->connectedProfile.bssid))
                             {
                                 //AP changed the 11d info on the fly, modify cfg
@@ -4095,21 +4106,21 @@ tANI_BOOLEAN csrLearnCountryInformation( tpAniSirGlobal pMac, tSirBssDescription
                     }
                 } //valid session
             } //for
-            if ( i == CSR_ROAM_SESSION_MAX ) 
+            if ( i == CSR_ROAM_SESSION_MAX )
             {
                 //Check whether we can use this country's 11d information
                 if( !pMac->roam.configParam.fEnforceDefaultDomain )
                 {
                     pMac->scan.fAmbiguous11dInfoFound = eANI_BOOLEAN_TRUE;
                 }
-                else 
+                else
                 {
                     if (pMac->scan.domainIdCurrent != pMac->scan.domainIdDefault)
                     {
                        VOS_ASSERT( pMac->scan.domainIdCurrent == pMac->scan.domainIdDefault );
                        return eANI_BOOLEAN_FALSE;
                     }
-                    if( HAL_STATUS_SUCCESS(csrGetRegulatoryDomainForCountry( 
+                    if( HAL_STATUS_SUCCESS(csrGetRegulatoryDomainForCountry(
                                 pMac, pIesLocal->Country.country, &domainId,
                                 COUNTRY_QUERY)) &&
                                 ( domainId == pMac->scan.domainIdCurrent ) )
@@ -4206,7 +4217,7 @@ tANI_BOOLEAN csrLearnCountryInformation( tpAniSirGlobal pMac, tSirBssDescription
         fRet = eANI_BOOLEAN_TRUE;
 
     } while( 0 );
-    
+
     if( !pIes && pIesLocal )
     {
         //locally allocated
@@ -4324,7 +4335,7 @@ tANI_BOOLEAN csrGetRemainingChannelsFor11dScan( tpAniSirGlobal pMac, tANI_U8 *pC
 eCsrScanCompleteNextCommand csrScanGetNextCommandState( tpAniSirGlobal pMac, tSmeCmd *pCommand, tANI_BOOLEAN fSuccess )
 {
     eCsrScanCompleteNextCommand NextCommand = eCsrNextScanNothing;
-    
+
     switch( pCommand->u.scanCmd.reason )
     {
         case eCsrScan11d1:
@@ -4332,7 +4343,7 @@ eCsrScanCompleteNextCommand csrScanGetNextCommandState( tpAniSirGlobal pMac, tSm
             break;
         case eCsrScan11d2:
             NextCommand = (fSuccess) ? eCsrNext11dScan2Success : eCsrNext11dScan2Failure;
-            break;    
+            break;
         case eCsrScan11dDone:
             NextCommand = eCsrNext11dScanComplete;
             break;
@@ -4366,7 +4377,7 @@ eCsrScanCompleteNextCommand csrScanGetNextCommandState( tpAniSirGlobal pMac, tSm
 tANI_BOOLEAN csrHandleScan11d1Failure(tpAniSirGlobal pMac, tSmeCmd *pCommand)
 {
     tANI_BOOLEAN fRet = eANI_BOOLEAN_TRUE;
-    
+
     //Apply back the default setting and passively scan one more time.
     csrResetCountryInformation(pMac, eANI_BOOLEAN_FALSE, eANI_BOOLEAN_TRUE);
     pCommand->u.scanCmd.reason = eCsrScan11d2;
@@ -4374,7 +4385,7 @@ tANI_BOOLEAN csrHandleScan11d1Failure(tpAniSirGlobal pMac, tSmeCmd *pCommand)
     {
         fRet = eANI_BOOLEAN_FALSE;
     }
-    
+
     return (fRet);
 }
 
@@ -4384,7 +4395,7 @@ tANI_BOOLEAN csrHandleScan11dSuccess(tpAniSirGlobal pMac, tSmeCmd *pCommand)
     tANI_BOOLEAN fRet = eANI_BOOLEAN_TRUE;
     tANI_U8 *pChannels;
     tANI_U8 cChannels;
-    
+
     pChannels = vos_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN);
     if ( NULL != pChannels )
     {
@@ -4414,7 +4425,7 @@ tANI_BOOLEAN csrHandleScan11dSuccess(tpAniSirGlobal pMac, tSmeCmd *pCommand)
         }
         vos_mem_free(pChannels);
     }
-    
+
     return (fRet);
 }
 
@@ -4439,7 +4450,7 @@ tANI_BOOLEAN csrScanComplete( tpAniSirGlobal pMac, tSirSmeScanRsp *pScanRsp )
         // If the head of the queue is Active and it is a SCAN command, remove
         // and put this on the Free queue.
         if ( eSmeCommandScan == pCommand->command )
-        {     
+        {
             tANI_U32 sessionId = pCommand->sessionId;
 
             if(eSIR_SME_SUCCESS != pScanRsp->statusCode)
@@ -4465,7 +4476,7 @@ tANI_BOOLEAN csrScanComplete( tpAniSirGlobal pMac, tSirSmeScanRsp *pScanRsp )
                 WLAN_VOS_DIAG_LOG_ALLOC(pScanLog, vos_log_scan_pkt_type, LOG_WLAN_SCAN_C);
                 if(pScanLog)
                 {
-                    if(eCsrScanBgScan == pCommand->u.scanCmd.reason || 
+                    if(eCsrScanBgScan == pCommand->u.scanCmd.reason ||
                         eCsrScanProbeBss == pCommand->u.scanCmd.reason ||
                         eCsrScanSetBGScanParam == pCommand->u.scanCmd.reason)
                     {
@@ -4540,7 +4551,7 @@ tANI_BOOLEAN csrScanComplete( tpAniSirGlobal pMac, tSirSmeScanRsp *pScanRsp )
                 if(fRemoveCommand)
                 {
                     NextCommand = eCsrNext11dScanComplete;
-                } 
+                }
                 break;
             case eCsrNextLostLinkScan1Success:
                 if(!HAL_STATUS_SUCCESS(csrIssueRoamAfterLostlinkScan(pMac, sessionId, eCsrLostLink1)))
@@ -4568,7 +4579,7 @@ tANI_BOOLEAN csrScanComplete( tpAniSirGlobal pMac, tSirSmeScanRsp *pScanRsp )
                 break;
             case eCsrNextLostLinkScan3Failed:
                 csrScanHandleFailedLostlink3(pMac, sessionId);
-                break;    
+                break;
             case eCsrNexteScanForSsidSuccess:
                 csrScanHandleSearchForSSID(pMac, pCommand);
                 break;
@@ -4597,13 +4608,13 @@ tANI_BOOLEAN csrScanComplete( tpAniSirGlobal pMac, tSirSmeScanRsp *pScanRsp )
         smsLog( pMac, LOGW, FL("Scan Completion called but NO commands are ACTIVE ..."));
         fRemoveCommand = eANI_BOOLEAN_FALSE;
     }
-   
+
     return( fRemoveCommand );
 }
 
 
 
-static void csrScanRemoveDupBssDescriptionFromInterimList( tpAniSirGlobal pMac, 
+static void csrScanRemoveDupBssDescriptionFromInterimList( tpAniSirGlobal pMac,
                                                            tSirBssDescription *pSirBssDescr,
                                                            tDot11fBeaconIEs *pIes)
 {
@@ -4614,14 +4625,14 @@ static void csrScanRemoveDupBssDescriptionFromInterimList( tpAniSirGlobal pMac,
     // matches the BssID of the BssDescription passed in, then these must be duplicate scan
     // results for this Bss.  In that case, remove the 'old' Bss description from the linked list.
     pEntry = csrLLPeekHead( &pMac->scan.tempScanResults, LL_ACCESS_LOCK );
-    while( pEntry ) 
+    while( pEntry )
     {
         pCsrBssDescription = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
 
         // we have a duplicate scan results only when BSSID, SSID, Channel and NetworkType
         // matches
 
-        if ( csrIsDuplicateBssDescription( pMac, &pCsrBssDescription->Result.BssDescriptor, 
+        if ( csrIsDuplicateBssDescription( pMac, &pCsrBssDescription->Result.BssDescriptor,
                                              pSirBssDescr, pIes, FALSE ) )
         {
             pSirBssDescr->rssi = (tANI_S8)( (((tANI_S32)pSirBssDescr->rssi * CSR_SCAN_RESULT_RSSI_WEIGHT ) +
@@ -4634,7 +4645,7 @@ static void csrScanRemoveDupBssDescriptionFromInterimList( tpAniSirGlobal pMac,
                 // we need to free the memory associated with this node
                 csrFreeScanResultEntry( pMac, pCsrBssDescription );
             }
-            
+
             // If we found a match, we can stop looking through the list.
             break;
         }
@@ -4647,14 +4658,14 @@ static void csrScanRemoveDupBssDescriptionFromInterimList( tpAniSirGlobal pMac,
 
 //Caller allocated memory pfNewBssForConn to return whether new candidate for
 //current connection is found. Cannot be NULL
-tCsrScanResult *csrScanSaveBssDescriptionToInterimList( tpAniSirGlobal pMac, 
+tCsrScanResult *csrScanSaveBssDescriptionToInterimList( tpAniSirGlobal pMac,
                                                         tSirBssDescription *pBSSDescription,
                                                         tDot11fBeaconIEs *pIes)
 {
     tCsrScanResult *pCsrBssDescription = NULL;
     tANI_U32 cbBSSDesc;
     tANI_U32 cbAllocated;
-    
+
     // figure out how big the BSS description is (the BSSDesc->length does NOT
     // include the size of the length field itself).
     cbBSSDesc = pBSSDescription->length + sizeof( pBSSDescription->length );
@@ -4688,9 +4699,9 @@ tCsrScanResult *csrScanSaveBssDescriptionToInterimList( tpAniSirGlobal pMac,
 }
 
 
-    
 
-tANI_BOOLEAN csrIsDuplicateBssDescription( tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc1, 
+
+tANI_BOOLEAN csrIsDuplicateBssDescription( tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc1,
                                            tSirBssDescription *pSirBssDesc2, tDot11fBeaconIEs *pIes2, tANI_BOOLEAN fForced )
 {
     tANI_BOOLEAN fMatch = FALSE;
@@ -4702,7 +4713,7 @@ tANI_BOOLEAN csrIsDuplicateBssDescription( tpAniSirGlobal pMac, tSirBssDescripti
     pCap2 = (tSirMacCapabilityInfo *)&pSirBssDesc2->capabilityInfo;
     if(pCap1->ess == pCap2->ess)
     {
-        if (pCap1->ess && 
+        if (pCap1->ess &&
                 csrIsMacAddressEqual( pMac, (tCsrBssid *)pSirBssDesc1->bssId, (tCsrBssid *)pSirBssDesc2->bssId)&&
             (fForced || (pSirBssDesc1->channelId == pSirBssDesc2->channelId)))
         {
@@ -4723,9 +4734,9 @@ tANI_BOOLEAN csrIsDuplicateBssDescription( tpAniSirGlobal pMac, tSirBssDescripti
                 }
                 if(pIes1->SSID.present && pIesTemp->SSID.present)
                 {
-                    fMatch = csrIsSsidMatch(pMac, pIes1->SSID.ssid, pIes1->SSID.num_ssid, 
+                    fMatch = csrIsSsidMatch(pMac, pIes1->SSID.ssid, pIes1->SSID.num_ssid,
                                             pIesTemp->SSID.ssid, pIesTemp->SSID.num_ssid, eANI_BOOLEAN_TRUE);
-                } 
+                }
             }while(0);
 
         }
@@ -4748,13 +4759,13 @@ tANI_BOOLEAN csrIsDuplicateBssDescription( tpAniSirGlobal pMac, tSirBssDescripti
                 //Same channel cannot have same SSID for different IBSS
                 if(pIes1->SSID.present && pIesTemp->SSID.present)
                 {
-                    fMatch = csrIsSsidMatch(pMac, pIes1->SSID.ssid, pIes1->SSID.num_ssid, 
+                    fMatch = csrIsSsidMatch(pMac, pIes1->SSID.ssid, pIes1->SSID.num_ssid,
                                             pIesTemp->SSID.ssid, pIesTemp->SSID.num_ssid, eANI_BOOLEAN_TRUE);
                 }
             }while(0);
         }
         /* In case of P2P devices, ess and ibss will be set to zero */
-        else if (!pCap1->ess && 
+        else if (!pCap1->ess &&
                 csrIsMacAddressEqual( pMac, (tCsrBssid *)pSirBssDesc1->bssId, (tCsrBssid *)pSirBssDesc2->bssId))
         {
             fMatch = TRUE;
@@ -4765,7 +4776,7 @@ tANI_BOOLEAN csrIsDuplicateBssDescription( tpAniSirGlobal pMac, tSirBssDescripti
     {
         vos_mem_free(pIes1);
     }
-    
+
     if( (NULL == pIes2) && pIesTemp )
     {
         //locally allocated
@@ -4783,7 +4794,7 @@ tANI_BOOLEAN csrIsNetworkTypeEqual( tSirBssDescription *pSirBssDesc1, tSirBssDes
 
 
 //to check whether the BSS matches the dot11Mode
-static tANI_BOOLEAN csrScanIsBssAllowed(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc, 
+static tANI_BOOLEAN csrScanIsBssAllowed(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc,
                                         tDot11fBeaconIEs *pIes)
 {
     tANI_BOOLEAN fAllowed = eANI_BOOLEAN_FALSE;
@@ -4837,8 +4848,8 @@ static tANI_BOOLEAN csrScanIsBssAllowed(tpAniSirGlobal pMac, tSirBssDescription
 
 
 //Return pIes to caller for future use when returning TRUE.
-static tANI_BOOLEAN csrScanValidateScanResult( tpAniSirGlobal pMac, tANI_U8 *pChannels, 
-                                               tANI_U8 numChn, tSirBssDescription *pBssDesc, 
+static tANI_BOOLEAN csrScanValidateScanResult( tpAniSirGlobal pMac, tANI_U8 *pChannels,
+                                               tANI_U8 numChn, tSirBssDescription *pBssDesc,
                                                tDot11fBeaconIEs **ppIes )
 {
     tANI_BOOLEAN fValidChannel = FALSE;
@@ -4848,11 +4859,11 @@ static tANI_BOOLEAN csrScanValidateScanResult( tpAniSirGlobal pMac, tANI_U8 *pCh
     for( index = 0; index < numChn; index++ )
     {
         // This check relies on the fact that a single BSS description is returned in each
-        // ScanRsp call, which is the way LIM implemented the scan req/rsp funtions.  We changed 
-        // to this model when we ran with a large number of APs.  If this were to change, then 
-        // this check would have to mess with removing the bssDescription from somewhere in an 
+        // ScanRsp call, which is the way LIM implemented the scan req/rsp funtions.  We changed
+        // to this model when we ran with a large number of APs.  If this were to change, then
+        // this check would have to mess with removing the bssDescription from somewhere in an
         // arbitrary index in the bssDescription array.
-        if ( pChannels[ index ] == pBssDesc->channelId ) 
+        if ( pChannels[ index ] == pBssDesc->channelId )
         {
            fValidChannel = TRUE;
            break;
@@ -4879,12 +4890,12 @@ static tANI_BOOLEAN csrScanValidateScanResult( tpAniSirGlobal pMac, tANI_U8 *pCh
         }
     }
 
-    return( fValidChannel );   
+    return( fValidChannel );
 }
 
 
 //Return whether last scan result is received
-static tANI_BOOLEAN csrScanProcessScanResults( tpAniSirGlobal pMac, tSmeCmd *pCommand, 
+static tANI_BOOLEAN csrScanProcessScanResults( tpAniSirGlobal pMac, tSmeCmd *pCommand,
                                                 tSirSmeScanRsp *pScanRsp, tANI_BOOLEAN *pfRemoveCommand )
 {
     tANI_BOOLEAN fRet = eANI_BOOLEAN_FALSE, fRemoveCommand = eANI_BOOLEAN_FALSE;
@@ -4892,7 +4903,7 @@ static tANI_BOOLEAN csrScanProcessScanResults( tpAniSirGlobal pMac, tSmeCmd *pCo
     tANI_U32 cbParsed;
     tSirBssDescription *pSirBssDescription;
     tANI_U32 cbBssDesc;
-    tANI_U32 cbScanResult = GET_FIELD_OFFSET( tSirSmeScanRsp, bssDescription ) 
+    tANI_U32 cbScanResult = GET_FIELD_OFFSET( tSirSmeScanRsp, bssDescription )
                             + sizeof(tSirBssDescription);    //We need at least one CB
 
     // don't consider the scan rsp to be valid if the status code is Scan Failure.  Scan Failure
@@ -4901,7 +4912,7 @@ static tANI_BOOLEAN csrScanProcessScanResults( tpAniSirGlobal pMac, tSmeCmd *pCo
     // BssDescriptions....
     do
     {
-        if ( ( cbScanResult <= pScanRsp->length ) && 
+        if ( ( cbScanResult <= pScanRsp->length ) &&
              (( eSIR_SME_SUCCESS == pScanRsp->statusCode ) ||
               ( eSIR_SME_MORE_SCAN_RESULTS_FOLLOW == pScanRsp->statusCode ) ) )
         {
@@ -4937,19 +4948,19 @@ static tANI_BOOLEAN csrScanProcessScanResults( tpAniSirGlobal pMac, tSmeCmd *pCo
             // let's drop the scan result.
             //
             // The other situation is where the scan request is for a scan on a particular channel set
-            // and the scan result is from a 
-            
+            // and the scan result is from a
+
             // if the NumChannels is 0, then we are supposed to be scanning all channels.  Use the full channel
             // list as the 'valid' channel list.  Otherwise, use the specific channel list in the scan parms
             // as the valid channels.
-            if ( 0 == cChannels ) 
+            if ( 0 == cChannels )
             {
                 tANI_U32 len = sizeof(pMac->roam.validChannelList);
-                
+
                 if (HAL_STATUS_SUCCESS(csrGetCfgValidChannels(pMac, (tANI_U8 *)pMac->roam.validChannelList, &len)))
                 {
                     pChannelList = pMac->roam.validChannelList;
-                    cChannels = (tANI_U8)len; 
+                    cChannels = (tANI_U8)len;
                 }
                 else
                 {
@@ -4964,7 +4975,7 @@ static tANI_BOOLEAN csrScanProcessScanResults( tpAniSirGlobal pMac, tSmeCmd *pCo
             pSirBssDescription = pScanRsp->bssDescription;
             while( cbParsed < pScanRsp->length )
             {
-                if ( csrScanValidateScanResult( pMac, pChannelList, cChannels, pSirBssDescription, &pIes ) ) 
+                if ( csrScanValidateScanResult( pMac, pChannelList, cChannels, pSirBssDescription, &pIes ) )
                 {
                     csrScanRemoveDupBssDescriptionFromInterimList(pMac, pSirBssDescription, pIes);
                     csrScanSaveBssDescriptionToInterimList( pMac, pSirBssDescription, pIes );
@@ -5196,7 +5207,7 @@ eHalStatus csrScanSmeScanResponse( tpAniSirGlobal pMac, void *pMsgBuf )
             case eCsrScanGetScanChnInfo:
                 pScanChnInfo = (tSmeGetScanChnRsp *)pMsgBuf;
                 /*
-                 * status code not available in tSmeGetScanChnRsp, so 
+                 * status code not available in tSmeGetScanChnRsp, so
                  * by default considereing it to be success
                  */
                 scanStatus = eSIR_SME_SUCCESS;
@@ -5225,14 +5236,16 @@ eHalStatus csrScanSmeScanResponse( tpAniSirGlobal pMac, void *pMsgBuf )
                        if( pCommand->u.scanCmd.reason != eCsrScanUserRequest)
                        {
                            csrScanGetScanChnInfo(pMac, pCommand->sessionId,
-                                                 NULL, NULL);
+                                                 NULL, NULL,
+                                                 pCommand->u.scanCmd.scanID);
                        }
                        else
                        {
                            csrScanGetScanChnInfo(pMac,
                                    pCommand->sessionId,
                                    pCommand->u.scanCmd.pContext,
-                                   pCommand->u.scanCmd.callback);
+                                   pCommand->u.scanCmd.callback,
+                                   pCommand->u.scanCmd.scanID);
                            pCommand->u.scanCmd.callback = NULL;
                        }
                     }
@@ -5265,7 +5278,7 @@ eHalStatus csrScanSmeScanResponse( tpAniSirGlobal pMac, void *pMsgBuf )
         smsLog( pMac, LOGW, "CSR: Scan Completion called but NO commands are ACTIVE ..." );
         status = eHAL_STATUS_FAILURE;
     }
-    
+
     return (status);
 }
 
@@ -5278,7 +5291,7 @@ tCsrScanResultInfo *csrScanResultGetFirst(tpAniSirGlobal pMac, tScanResultHandle
     tCsrScanResult *pResult;
     tCsrScanResultInfo *pRet = NULL;
     tScanResultList *pResultList = (tScanResultList *)hScanResult;
-    
+
     if(pResultList)
     {
         csrLLLock(&pResultList->List);
@@ -5291,7 +5304,7 @@ tCsrScanResultInfo *csrScanResultGetFirst(tpAniSirGlobal pMac, tScanResultHandle
         pResultList->pCurEntry = pEntry;
         csrLLUnlock(&pResultList->List);
     }
-    
+
     return pRet;
 }
 
@@ -5302,7 +5315,7 @@ tCsrScanResultInfo *csrScanResultGetNext(tpAniSirGlobal pMac, tScanResultHandle
     tCsrScanResult *pResult = NULL;
     tCsrScanResultInfo *pRet = NULL;
     tScanResultList *pResultList = (tScanResultList *)hScanResult;
-    
+
     if(pResultList)
     {
         csrLLLock(&pResultList->List);
@@ -5322,7 +5335,7 @@ tCsrScanResultInfo *csrScanResultGetNext(tpAniSirGlobal pMac, tScanResultHandle
         pResultList->pCurEntry = pEntry;
         csrLLUnlock(&pResultList->List);
     }
-    
+
     return pRet;
 }
 
@@ -5334,7 +5347,7 @@ eHalStatus csrMoveBssToHeadFromBSSID(tpAniSirGlobal pMac, tCsrBssid *bssid, tSca
     tScanResultList *pResultList = (tScanResultList *)hScanResult;
     tCsrScanResult *pResult = NULL;
     tListElem *pEntry = NULL;
-   
+
     if(pResultList && bssid)
     {
         csrLLLock(&pResultList->List);
@@ -5353,7 +5366,7 @@ eHalStatus csrMoveBssToHeadFromBSSID(tpAniSirGlobal pMac, tCsrBssid *bssid, tSca
         }
         csrLLUnlock(&pResultList->List);
     }
-    
+
     return (status);
 }
 
@@ -5374,7 +5387,7 @@ tANI_BOOLEAN csrScanAgeOutBss(tpAniSirGlobal pMac, tCsrScanResult *pResult)
             pSession = CSR_GET_SESSION( pMac, i );
             //Not to remove the BSS we are connected to.
             if(csrIsConnStateDisconnected(pMac, i) || (NULL == pSession->pConnectBssDesc) ||
-              (!csrIsDuplicateBssDescription(pMac, &pResult->Result.BssDescriptor, 
+              (!csrIsDuplicateBssDescription(pMac, &pResult->Result.BssDescriptor,
                                              pSession->pConnectBssDesc, NULL, FALSE))
               )
             {
@@ -5415,7 +5428,7 @@ eHalStatus csrScanAgeResults(tpAniSirGlobal pMac, tSmeGetScanChnRsp *pScanChnInf
     {
         pChnInfo = &pScanChnInfo->scanChn[i];
         pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_NOLOCK );
-        while( pEntry ) 
+        while( pEntry )
         {
             tmpEntry = csrLLNext(&pMac->scan.scanResultList, pEntry, LL_ACCESS_NOLOCK);
             pResult = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
@@ -5440,7 +5453,7 @@ eHalStatus csrScanAgeResults(tpAniSirGlobal pMac, tSmeGetScanChnRsp *pScanChnInf
 }
 
 
-eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId, 
+eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId,
                     tCsrScanRequest *pScanReq, tScanReqParam *pScanReqParam )
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -5454,7 +5467,7 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId,
     tANI_U8 selfMacAddr[WNI_CFG_BSSID_LEN];
     tANI_U8 *pSelfMac = NULL;
 
-    msgLen = (tANI_U16)(sizeof( tSirSmeScanReq ) - sizeof( pMsg->channelList.channelNumber ) + 
+    msgLen = (tANI_U16)(sizeof( tSirSmeScanReq ) - sizeof( pMsg->channelList.channelNumber ) +
                         ( sizeof( pMsg->channelList.channelNumber ) * pScanReq->ChannelInfo.numOfChannels )) +
                    ( pScanReq->uIEFieldLen ) ;
 
@@ -5507,7 +5520,7 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId,
                 tANI_U32 len = WNI_CFG_BSSID_LEN;
                 pSelfMac = selfMacAddr;
                 status = ccmCfgGetStr( pMac, WNI_CFG_STA_ID, pSelfMac, &len );
-                if( !HAL_STATUS_SUCCESS( status ) || 
+                if( !HAL_STATUS_SUCCESS( status ) ||
                     ( len < WNI_CFG_BSSID_LEN ) )
                 {
                   smsLog( pMac, LOGE, FL(" Can not get self MAC address from CFG status = %d"), status );
@@ -5532,7 +5545,7 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId,
             minChnTime = pScanReq->minChnTime;
             maxChnTime = pScanReq->maxChnTime;
 
-            //Verify the scan type first, if the scan is active scan, we need to make sure we 
+            //Verify the scan type first, if the scan is active scan, we need to make sure we
             //are allowed to do so.
             /* if 11d is enabled & we don't see any beacon around, scan type falls
                back to passive. But in BT AMP STA mode we need to send out a
@@ -5544,7 +5557,7 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId,
                 scanType = pMac->scan.curScanType;
                 if(eSIR_PASSIVE_SCAN == pMac->scan.curScanType)
                 {
-                    if(minChnTime < pMac->roam.configParam.nPassiveMinChnTime) 
+                    if(minChnTime < pMac->roam.configParam.nPassiveMinChnTime)
                     {
                         minChnTime = pMac->roam.configParam.nPassiveMinChnTime;
                     }
@@ -5600,23 +5613,23 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId,
             }
 
             pMsg->uIEFieldLen = (tANI_U16) pScanReq->uIEFieldLen;
-            pMsg->uIEFieldOffset = (tANI_U16)(sizeof( tSirSmeScanReq ) - sizeof( pMsg->channelList.channelNumber ) + 
+            pMsg->uIEFieldOffset = (tANI_U16)(sizeof( tSirSmeScanReq ) - sizeof( pMsg->channelList.channelNumber ) +
                   ( sizeof( pMsg->channelList.channelNumber ) * pScanReq->ChannelInfo.numOfChannels )) ;
-            if(pScanReq->uIEFieldLen != 0) 
+            if(pScanReq->uIEFieldLen != 0)
             {
                 vos_mem_copy((tANI_U8 *)pMsg+pMsg->uIEFieldOffset, pScanReq->pIEField,
                               pScanReq->uIEFieldLen);
             }
             pMsg->p2pSearch = pScanReq->p2pSearch;
 
-            if (pScanReq->requestType == eCSR_SCAN_HO_BG_SCAN) 
+            if (pScanReq->requestType == eCSR_SCAN_HO_BG_SCAN)
             {
                 pMsg->backgroundScanMode = eSIR_ROAMING_SCAN;
-            } 
+            }
 
         }while(0);
         smsLog(pMac, LOG1, FL("domainIdCurrent %d scanType %d bssType %d requestType %d numChannels %d  "),
-               pMac->scan.domainIdCurrent, pMsg->scanType, pMsg->bssType, 
+               pMac->scan.domainIdCurrent, pMsg->scanType, pMsg->bssType,
                pScanReq->requestType, pMsg->channelList.numChannels);
 
         for(i = 0; i < pMsg->channelList.numChannels; i++)
@@ -5628,7 +5641,7 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId,
         {
             status = palSendMBMessage(pMac->hHdd, pMsg);
         }
-        else 
+        else
         {
             smsLog( pMac, LOGE, FL(" failed to send down scan req with status = %d"), status );
             vos_mem_free(pMsg);
@@ -5669,7 +5682,7 @@ eHalStatus csrSendMBScanResultReq( tpAniSirGlobal pMac, tANI_U32 sessionId, tSca
             smsLog( pMac, LOGE, FL(" failed to send down scan req with status = %d\n"), status );
         }
 
-    }                             
+    }
 
     return( status );
 }
@@ -5680,9 +5693,9 @@ eHalStatus csrScanChannels( tpAniSirGlobal pMac, tSmeCmd *pCommand )
 {
     eHalStatus status = eHAL_STATUS_FAILURE;
     tScanReqParam scanReq;
-    
+
     do
-    {    
+    {
         /*
          * Don't delete cached results. Rome rssi based scan candidates
          * may land up in scan cache instead of LFR cache.
@@ -5713,14 +5726,14 @@ eHalStatus csrScanChannels( tpAniSirGlobal pMac, tSmeCmd *pCommand )
             WLAN_VOS_DIAG_LOG_ALLOC(pScanLog, vos_log_scan_pkt_type, LOG_WLAN_SCAN_C);
             if(pScanLog)
             {
-                if(eCsrScanBgScan == pCommand->u.scanCmd.reason || 
+                if(eCsrScanBgScan == pCommand->u.scanCmd.reason ||
                     eCsrScanProbeBss == pCommand->u.scanCmd.reason)
                 {
                     pScanLog->eventId = WLAN_SCAN_EVENT_HO_SCAN_REQ;
                 }
                 else
                 {
-                    if( (eSIR_PASSIVE_SCAN != pCommand->u.scanCmd.u.scanRequest.scanType) && 
+                    if( (eSIR_PASSIVE_SCAN != pCommand->u.scanCmd.u.scanRequest.scanType) &&
                         (eSIR_PASSIVE_SCAN != pMac->scan.curScanType) )
                     {
                         pScanLog->eventId = WLAN_SCAN_EVENT_ACTIVE_SCAN_REQ;
@@ -5748,7 +5761,7 @@ eHalStatus csrScanChannels( tpAniSirGlobal pMac, tSmeCmd *pCommand )
         status = csrSendMBScanReq(pMac, pCommand->sessionId,
                                 &pCommand->u.scanCmd.u.scanRequest, &scanReq);
     }while(0);
-    
+
     return( status );
 }
 
@@ -5757,9 +5770,9 @@ eHalStatus csrScanRetrieveResult(tpAniSirGlobal pMac, tSmeCmd *pCommand)
 {
     eHalStatus status = eHAL_STATUS_FAILURE;
     tScanReqParam scanReq;
-    
+
     do
-    {    
+    {
 #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
         if (eCsrScanGetLfrResult == pCommand->u.scanCmd.reason)
         {
@@ -5778,7 +5791,7 @@ eHalStatus csrScanRetrieveResult(tpAniSirGlobal pMac, tSmeCmd *pCommand)
         }
         status = csrSendMBScanResultReq(pMac, pCommand->sessionId, &scanReq);
     }while(0);
-    
+
     return (status);
 }
 
@@ -5892,13 +5905,13 @@ eHalStatus csrProcessScanCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
     default:
         status = csrScanChannels(pMac, pCommand);
         break;
-    }    
-    
+    }
+
     if(!HAL_STATUS_SUCCESS(status))
     {
         csrReleaseScanCommand(pMac, pCommand, eCSR_SCAN_FAILURE);
     }
-    
+
     return (status);
 }
 
@@ -5907,7 +5920,7 @@ eHalStatus csrScanSetBGScanparams(tpAniSirGlobal pMac, tCsrBGScanRequest *pScanR
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tSmeCmd *pCommand = NULL;
-    
+
     if(pScanReq)
     {
         do
@@ -5969,7 +5982,7 @@ eHalStatus csrScanSetBGScanparams(tpAniSirGlobal pMac, tCsrBGScanRequest *pScanR
             }
         }while(0);
     }
-    
+
     return (status);
 }
 
@@ -5977,7 +5990,7 @@ eHalStatus csrScanBGScanAbort( tpAniSirGlobal pMac )
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tSmeCmd *pCommand = NULL;
-    
+
     do
     {
         pCommand = csrGetCommandBuffer(pMac);
@@ -5987,7 +6000,7 @@ eHalStatus csrScanBGScanAbort( tpAniSirGlobal pMac )
             break;
         }
         vos_mem_set(&pCommand->u.scanCmd, sizeof(tScanCmd), 0);
-        pCommand->command = eSmeCommandScan; 
+        pCommand->command = eSmeCommandScan;
         pCommand->u.scanCmd.reason = eCsrScanBGScanAbort;
         pCommand->u.scanCmd.callback = NULL;
         pCommand->u.scanCmd.pContext = NULL;
@@ -5999,17 +6012,17 @@ eHalStatus csrScanBGScanAbort( tpAniSirGlobal pMac )
             break;
         }
     }while(0);
-    
+
     return (status);
 }
 
 
-//This will enable the background scan with the non-zero interval 
+//This will enable the background scan with the non-zero interval
 eHalStatus csrScanBGScanEnable(tpAniSirGlobal pMac)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tSmeCmd *pCommand = NULL;
-    
+
     if(pMac->roam.configParam.bgScanInterval)
     {
         do
@@ -6021,7 +6034,7 @@ eHalStatus csrScanBGScanEnable(tpAniSirGlobal pMac)
                 break;
             }
             vos_mem_set(&pCommand->u.scanCmd, sizeof(tScanCmd), 0);
-            pCommand->command = eSmeCommandScan; 
+            pCommand->command = eSmeCommandScan;
             pCommand->u.scanCmd.reason = eCsrScanBGScanEnable;
             pCommand->u.scanCmd.callback = NULL;
             pCommand->u.scanCmd.pContext = NULL;
@@ -6045,7 +6058,7 @@ eHalStatus csrScanBGScanEnable(tpAniSirGlobal pMac)
         smsLog(pMac, LOGE, FL("cannot continue because the bgscan interval is 0"));
         status = eHAL_STATUS_INVALID_PARAMETER;
     }
-    
+
     return (status);
 }
 
@@ -6129,7 +6142,7 @@ eHalStatus csrScanCopyRequest(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq, tCs
                         for ( index = 0; index < pSrcReq->ChannelInfo.numOfChannels ; index++ )
                         {
                             /* Allow scan on valid channels only.
-                             * If it is p2p scan and valid channel list doesnt contain 
+                             * If it is p2p scan and valid channel list doesnt contain
                              * social channels, enforce scan on social channels because
                              * that is the only way to find p2p peers.
                              * This can happen only if band is set to 5Ghz mode.
@@ -6138,12 +6151,12 @@ eHalStatus csrScanCopyRequest(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq, tCs
                                ((eCSR_SCAN_P2P_DISCOVERY == pSrcReq->requestType) &&
                                 CSR_IS_SOCIAL_CHANNEL(pSrcReq->ChannelInfo.ChannelList[index])))
                             {
-                                if( (pSrcReq->skipDfsChnlInP2pSearch && 
+                                if( (pSrcReq->skipDfsChnlInP2pSearch &&
                                     (NV_CHANNEL_DFS == vos_nv_getChannelEnabledState(pSrcReq->ChannelInfo.ChannelList[index])) )
 #ifdef FEATURE_WLAN_LFR
-                                     /* 
+                                     /*
                                       * If LFR is requesting a contiguous scan
-                                      * (i.e. numOfChannels > 1), then ignore 
+                                      * (i.e. numOfChannels > 1), then ignore
                                       * DFS channels.
                                       * TODO: vos_nv_getChannelEnabledState is returning
                                       * 120, 124 and 128 as non-DFS channels. Hence, the
@@ -6180,7 +6193,7 @@ eHalStatus csrScanCopyRequest(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq, tCs
                              * No valid channels found in the request.
                              * Only perform scan on the channels passed
                              * pSrcReq if it is a eCSR_SCAN_HO_BG_SCAN.
-                             * Passing 0 to LIM will trigger a scan on 
+                             * Passing 0 to LIM will trigger a scan on
                              * all valid channels which is not desirable.
                              */
                             smsLog(pMac, LOGE, "%s: no valid channels found (request=%d)",
@@ -6238,19 +6251,19 @@ eHalStatus csrScanCopyRequest(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq, tCs
 
         }
     }while(0);
-    
+
     if(!HAL_STATUS_SUCCESS(status))
     {
         csrScanFreeRequest(pMac, pDstReq);
     }
-    
+
     return (status);
 }
 
 
 eHalStatus csrScanFreeRequest(tpAniSirGlobal pMac, tCsrScanRequest *pReq)
 {
-    
+
     if(pReq->ChannelInfo.ChannelList)
     {
         vos_mem_free(pReq->ChannelInfo.ChannelList);
@@ -6269,7 +6282,7 @@ eHalStatus csrScanFreeRequest(tpAniSirGlobal pMac, tCsrScanRequest *pReq)
         pReq->SSIDs.SSIDList = NULL;
     }
     pReq->SSIDs.numOfSSIDs = 0;
-    
+
     return eHAL_STATUS_SUCCESS;
 }
 
@@ -6279,7 +6292,7 @@ void csrScanCallCallback(tpAniSirGlobal pMac, tSmeCmd *pCommand, eCsrScanStatus
     if(pCommand->u.scanCmd.callback)
     {
 //        sme_ReleaseGlobalLock( &pMac->sme );
-        pCommand->u.scanCmd.callback(pMac, pCommand->u.scanCmd.pContext, pCommand->u.scanCmd.scanID, scanStatus); 
+        pCommand->u.scanCmd.callback(pMac, pCommand->u.scanCmd.pContext, pCommand->u.scanCmd.scanID, scanStatus);
 //        sme_AcquireGlobalLock( &pMac->sme );
     } else {
         smsLog( pMac, LOG2, "%s:%d - Callback NULL!!!", __func__, __LINE__);
@@ -6303,7 +6316,7 @@ void csrScanStopTimers(tpAniSirGlobal pMac)
 eHalStatus csrScanStartGetResultTimer(tpAniSirGlobal pMac)
 {
     eHalStatus status;
-    
+
     if(pMac->scan.fScanEnable)
     {
         status = vos_timer_start(&pMac->scan.hTimerGetResult, CSR_SCAN_GET_RESULT_INTERVAL/PAL_TIMER_TO_MS_UNIT);
@@ -6312,7 +6325,7 @@ eHalStatus csrScanStartGetResultTimer(tpAniSirGlobal pMac)
     {
         status = eHAL_STATUS_FAILURE;
     }
-    
+
     return (status);
 }
 
@@ -6326,7 +6339,7 @@ eHalStatus csrScanStopGetResultTimer(tpAniSirGlobal pMac)
 void csrScanGetResultTimerHandler(void *pv)
 {
     tpAniSirGlobal pMac = PMAC_STRUCT( pv );
-    
+
     csrScanRequestResult(pMac);
 
     vos_timer_start(&pMac->scan.hTimerGetResult, CSR_SCAN_GET_RESULT_INTERVAL/PAL_TIMER_TO_MS_UNIT);
@@ -6342,7 +6355,7 @@ static void csrStaApConcTimerHandler(void *pv)
     csrLLLock(&pMac->scan.scanCmdPendingList);
 
     if ( NULL != ( pEntry = csrLLPeekHead( &pMac->scan.scanCmdPendingList, LL_ACCESS_NOLOCK) ) )
-    {    
+    {
         tCsrScanRequest scanReq;
         tSmeCmd *pSendScanCmd = NULL;
         tANI_U8 numChn = 0;
@@ -6351,7 +6364,7 @@ static void csrStaApConcTimerHandler(void *pv)
         tCsrChannelInfo *pChnInfo = &scanReq.ChannelInfo;
         tANI_U8    channelToScan[WNI_CFG_VALID_CHANNEL_LIST_LEN];
         eHalStatus status;
-       
+
         pScanCmd = GET_BASE_ADDR( pEntry, tSmeCmd, Link );
         numChn = pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels;
 
@@ -6364,7 +6377,7 @@ static void csrStaApConcTimerHandler(void *pv)
          * any one of the following:
          * - STA session is connected and the scan is not a P2P search
          * - any P2P session is connected
-         * Do not split scans if no concurrent infra connections are 
+         * Do not split scans if no concurrent infra connections are
          * active and if the scan is a BG scan triggered by LFR (OR)
          * any scan if LFR is in the middle of a BG scan. Splitting
          * the scan is delaying the time it takes for LFR to find
@@ -6382,11 +6395,11 @@ static void csrStaApConcTimerHandler(void *pv)
         }
 
         if ( (numChn > nNumChanCombinedConc) &&
-                ((csrIsStaSessionConnected(pMac) && 
+                ((csrIsStaSessionConnected(pMac) &&
 #ifdef FEATURE_WLAN_LFR
                   (csrIsConcurrentInfraConnected(pMac) ||
                    ((pScanCmd->u.scanCmd.reason != eCsrScanBgScan) &&
-                    (pMac->roam.neighborRoamInfo.neighborRoamState != 
+                    (pMac->roam.neighborRoamInfo.neighborRoamState !=
                      eCSR_NEIGHBOR_ROAM_STATE_CFG_CHAN_LIST_SCAN))) &&
 #endif
                   (pScanCmd->u.scanCmd.u.scanRequest.p2pSearch != 1)) ||
@@ -6401,7 +6414,7 @@ static void csrStaApConcTimerHandler(void *pv)
                  csrLLUnlock(&pMac->scan.scanCmdPendingList);
                  return;
              }
-             pSendScanCmd->command = pScanCmd->command; 
+             pSendScanCmd->command = pScanCmd->command;
              pSendScanCmd->sessionId = pScanCmd->sessionId;
              pSendScanCmd->u.scanCmd.callback = NULL;
              pSendScanCmd->u.scanCmd.pContext = pScanCmd->u.scanCmd.pContext;
@@ -6410,14 +6423,14 @@ static void csrStaApConcTimerHandler(void *pv)
 
              /* First copy all the parameters to local variable of scan request */
              csrScanCopyRequest(pMac, &scanReq, &pScanCmd->u.scanCmd.u.scanRequest);
-             
+
              /* Now modify the elements of local var scan request required to be modified for split scan */
              if(scanReq.ChannelInfo.ChannelList != NULL)
              {
                  vos_mem_free(scanReq.ChannelInfo.ChannelList);
                  scanReq.ChannelInfo.ChannelList = NULL;
              }
-             
+
              pChnInfo->numOfChannels = nNumChanCombinedConc;
              vos_mem_copy(&channelToScan[0],
                           &pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[0],
@@ -6426,16 +6439,16 @@ static void csrStaApConcTimerHandler(void *pv)
 
              for (i = 0, j = nNumChanCombinedConc; i < (numChn-nNumChanCombinedConc); i++, j++)
              {
-                 pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[i] = 
+                 pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[i] =
                  pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[j]; //Move all the channels one step
              }
-          
+
              pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels = numChn - nNumChanCombinedConc; //reduce outstanding # of channels to be scanned
 
              scanReq.BSSType = eCSR_BSS_TYPE_ANY;
              //Modify callers parameters in case of concurrency
              scanReq.scanType = eSIR_ACTIVE_SCAN;
-             //Use concurrency values for min/maxChnTime. 
+             //Use concurrency values for min/maxChnTime.
              //We know csrIsAnySessionConnected(pMac) returns TRUE here
              csrSetDefaultScanTiming(pMac, scanReq.scanType, &scanReq);
 
@@ -6456,26 +6469,26 @@ static void csrStaApConcTimerHandler(void *pv)
              /* no active connected session present or numChn == 1
               * scan all remaining channels */
              pSendScanCmd = pScanCmd;
-             //remove this command from pending list 
+             //remove this command from pending list
              if (csrLLRemoveHead( &pMac->scan.scanCmdPendingList, LL_ACCESS_NOLOCK) == NULL)
              { //In case between PeekHead and here, the entry got removed by another thread.
                  smsLog( pMac, LOGE, FL(" Failed to remove entry from scanCmdPendingList"));
              }
-            
-        }               
+
+        }
         csrQueueSmeCommand(pMac, pSendScanCmd, eANI_BOOLEAN_FALSE);
 
     }
 
     csrLLUnlock(&pMac->scan.scanCmdPendingList);
-    
+
 }
 #endif
 
 eHalStatus csrScanStartResultAgingTimer(tpAniSirGlobal pMac)
 {
     eHalStatus status = eHAL_STATUS_FAILURE;
-    
+
     if(pMac->scan.fScanEnable)
     {
         status = vos_timer_start(&pMac->scan.hTimerResultAging, CSR_SCAN_RESULT_AGING_INTERVAL/PAL_TIMER_TO_MS_UNIT);
@@ -6512,7 +6525,7 @@ eHalStatus csrScanStopResultCfgAgingTimer(tpAniSirGlobal pMac)
 //Connected w/o traffic, with PS
 //Connected w/ traffic, no PS -- Not supported
 //Connected w/ traffic, with PS -- Not supported
-//the return unit is in seconds. 
+//the return unit is in seconds.
 tANI_U32 csrScanGetAgeOutTime(tpAniSirGlobal pMac)
 {
     tANI_U32 nRet;
@@ -6572,10 +6585,10 @@ void csrScanResultAgingTimerHandler(void *pv)
 {
     tpAniSirGlobal pMac = PMAC_STRUCT( pv );
     tANI_BOOLEAN fDisconnected = csrIsAllSessionDisconnected(pMac);
-    
+
     //no scan, no aging
-    if(pMac->scan.fScanEnable && 
-        (((eANI_BOOLEAN_FALSE == fDisconnected) && pMac->roam.configParam.bgScanInterval)    
+    if(pMac->scan.fScanEnable &&
+        (((eANI_BOOLEAN_FALSE == fDisconnected) && pMac->roam.configParam.bgScanInterval)
         || (fDisconnected && (pMac->scan.fCancelIdleScan == eANI_BOOLEAN_FALSE)))
         )
     {
@@ -6586,7 +6599,7 @@ void csrScanResultAgingTimerHandler(void *pv)
 
         csrLLLock(&pMac->scan.scanResultList);
         pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_NOLOCK );
-        while( pEntry ) 
+        while( pEntry )
         {
             tmpEntry = csrLLNext(&pMac->scan.scanResultList, pEntry, LL_ACCESS_NOLOCK);
             pResult = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
@@ -6609,10 +6622,10 @@ static void csrScanResultCfgAgingTimerHandler(void *pv)
     tCsrScanResult *pResult;
     tANI_TIMESTAMP ageOutTime =  pMac->scan.scanResultCfgAgingTime * PAL_TICKS_PER_SECOND;
     tANI_TIMESTAMP curTime = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
-  
+
     csrLLLock(&pMac->scan.scanResultList);
     pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_NOLOCK );
-    while( pEntry ) 
+    while( pEntry )
     {
         tmpEntry = csrLLNext(&pMac->scan.scanResultList, pEntry, LL_ACCESS_NOLOCK);
         pResult = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
@@ -6630,7 +6643,7 @@ static void csrScanResultCfgAgingTimerHandler(void *pv)
 eHalStatus csrScanStartIdleScanTimer(tpAniSirGlobal pMac, tANI_U32 interval)
 {
     eHalStatus status;
-    
+
     smsLog(pMac, LOG1, " csrScanStartIdleScanTimer");
     if((pMac->scan.fScanEnable) && (eANI_BOOLEAN_FALSE == pMac->scan.fCancelIdleScan) && interval)
     {
@@ -6652,7 +6665,7 @@ eHalStatus csrScanStartIdleScanTimer(tpAniSirGlobal pMac, tANI_U32 interval)
         }
         status = eHAL_STATUS_FAILURE;
     }
-    
+
     return (status);
 }
 
@@ -6684,7 +6697,7 @@ void csrScanIMPSCallback(void *callbackContext, eHalStatus status)
 
     if(eANI_BOOLEAN_FALSE == pMac->scan.fCancelIdleScan)
     {
-        if(pMac->roam.configParam.IsIdleScanEnabled) 
+        if(pMac->roam.configParam.IsIdleScanEnabled)
         {
             if(HAL_STATUS_SUCCESS(status))
             {
@@ -6708,7 +6721,7 @@ void csrScanIMPSCallback(void *callbackContext, eHalStatus status)
         }
         else
         {//we might need another flag to check if CSR needs to request imps at all
-       
+
             tANI_U32 nTime = 0;
 
             pMac->scan.fRestartIdleScan = eANI_BOOLEAN_FALSE;
@@ -6721,7 +6734,7 @@ void csrScanIMPSCallback(void *callbackContext, eHalStatus status)
 }
 
 
-//Param: pTimeInterval -- Caller allocated memory in return, if failed, to specify the nxt time interval for 
+//Param: pTimeInterval -- Caller allocated memory in return, if failed, to specify the nxt time interval for
 //idle scan timer interval
 //Return: Not success -- meaning it cannot start IMPS, caller needs to start a timer for idle scan
 eHalStatus csrScanTriggerIdleScan(tpAniSirGlobal pMac, tANI_U32 *pTimeInterval)
@@ -6765,7 +6778,7 @@ eHalStatus csrScanTriggerIdleScan(tpAniSirGlobal pMac, tANI_U32 *pTimeInterval)
 
         return status;
     }
-    if((pMac->scan.fScanEnable) && (eANI_BOOLEAN_FALSE == pMac->scan.fCancelIdleScan) 
+    if((pMac->scan.fScanEnable) && (eANI_BOOLEAN_FALSE == pMac->scan.fCancelIdleScan)
     /*&& pMac->roam.configParam.impsSleepTime*/)
     {
         //Stop get result timer because idle scan gets scan result out of PE
@@ -6787,7 +6800,7 @@ eHalStatus csrScanTriggerIdleScan(tpAniSirGlobal pMac, tANI_U32 *pTimeInterval)
                     {
                     *pTimeInterval = 0;
                 }
-                    //Set the restart flag to true because that idle scan 
+                    //Set the restart flag to true because that idle scan
                     //can be restarted even though the timer will not be running
                     pMac->scan.fRestartIdleScan = eANI_BOOLEAN_TRUE;
                 }
@@ -7028,11 +7041,11 @@ tANI_BOOLEAN csrScanRemoveFreshScanCommand(tpAniSirGlobal pMac, tANI_U8 sessionI
         pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link);
         if (pCommand->u.scanCmd.callback)
         {
-            /* User scan request is pending, 
+            /* User scan request is pending,
                                  * send response with status eCSR_SCAN_ABORT*/
-            pCommand->u.scanCmd.callback(pMac, 
-                     pCommand->u.scanCmd.pContext, 
-                     pCommand->u.scanCmd.scanID, 
+            pCommand->u.scanCmd.callback(pMac,
+                     pCommand->u.scanCmd.pContext,
+                     pCommand->u.scanCmd.scanID,
                      eCSR_SCAN_ABORT);
         }
         csrReleaseCommandScan( pMac, pCommand );
@@ -7126,7 +7139,7 @@ eHalStatus csrScanGetPMKIDCandidateList(tpAniSirGlobal pMac, tANI_U32 sessionId,
                     while(((pScanResult = csrScanResultGetNext(pMac, hBSSList)) != NULL) && ( pSession->NumPmkidCandidate < nItems))
                     {
                         //NumPmkidCandidate adds up here
-                        csrProcessBSSDescForPMKIDList(pMac, &pScanResult->BssDescriptor, 
+                        csrProcessBSSDescForPMKIDList(pMac, &pScanResult->BssDescriptor,
                                                       (tDot11fBeaconIEs *)( pScanResult->pvIes ));
                     }
                     if(pSession->NumPmkidCandidate)
@@ -7208,13 +7221,13 @@ eHalStatus csrScanGetBKIDCandidateList(tpAniSirGlobal pMac, tANI_U32 sessionId,
 
 
 
-//This function is usually used for BSSs that suppresses SSID so the profile 
+//This function is usually used for BSSs that suppresses SSID so the profile
 //shall have one and only one SSID
 eHalStatus csrScanForSSID(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, tANI_U32 roamId, tANI_BOOLEAN notify)
 {
     eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
     tSmeCmd *pScanCmd = NULL;
-    tANI_U8 bAddr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; 
+    tANI_U8 bAddr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
     tANI_U8  index = 0;
     tANI_U32 numSsid = pProfile->SSIDs.numOfSSIDs;
 
@@ -7329,11 +7342,11 @@ eHalStatus csrScanForSSID(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
                   {
                      if(csrRoamIsValidChannel(pMac, pProfile->ChannelInfo.ChannelList[index]))
                      {
-                        pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels] 
+                        pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList[pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels]
                            = pProfile->ChannelInfo.ChannelList[index];
                         pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels++;
                      }
-                     else 
+                     else
                      {
                          smsLog(pMac, LOGW, FL("process a channel (%d) that is invalid"), pProfile->ChannelInfo.ChannelList[index]);
                      }
@@ -7392,7 +7405,7 @@ eHalStatus csrScanForSSID(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
         smsLog(pMac, LOGE, FL("cannot scan because scanEnable (%d) or numSSID (%d) is invalid"),
                 pMac->scan.fScanEnable, pProfile->SSIDs.numOfSSIDs);
     }
-    
+
     return (status);
 }
 
@@ -7419,7 +7432,7 @@ eHalStatus csrScanForCapabilityChange(tpAniSirGlobal pMac, tSirSmeApNewCaps *pNe
             vos_mem_set(&pScanCmd->u.scanCmd, sizeof(tScanCmd), 0);
             status = eHAL_STATUS_SUCCESS;
             pScanCmd->u.scanCmd.roamId = 0;
-            pScanCmd->command = eSmeCommandScan; 
+            pScanCmd->command = eSmeCommandScan;
             pScanCmd->u.scanCmd.callback = NULL;
             pScanCmd->u.scanCmd.pContext = NULL;
             pScanCmd->u.scanCmd.reason = eCsrScanForCapsChange;
@@ -7437,7 +7450,7 @@ eHalStatus csrScanForCapabilityChange(tpAniSirGlobal pMac, tSirSmeApNewCaps *pNe
             {
                 csrReleaseCommandScan(pMac, pScanCmd);
             }
-        }    
+        }
     }
 
     return (status);
@@ -7463,7 +7476,7 @@ void csrInitBGScanChannelList(tpAniSirGlobal pMac)
 }
 
 
-//This function return TRUE if background scan channel list is adjusted. 
+//This function return TRUE if background scan channel list is adjusted.
 //this function will only shrink the background scan channel list
 tANI_BOOLEAN csrAdjustBGScanChannelList(tpAniSirGlobal pMac, tANI_U8 *pChannelList, tANI_U8 NumChannels,
                                         tANI_U8 *pAdjustChannels, tANI_U8 *pNumAdjustChannels)
@@ -7521,7 +7534,7 @@ eHalStatus csrScanGetSupportedChannels( tpAniSirGlobal pMac )
         smsLog( pMac, LOGE, FL(" failed") );
         pMac->scan.baseChannels.numChannels = 0;
     }
-    
+
     return ( status );
 }
 
@@ -7638,7 +7651,7 @@ void csrSaveTxPowerToCfg( tpAniSirGlobal pMac, tDblLinkList *pList, tANI_U32 cfg
 
         if(cbLen)
         {
-            ccmCfgSetStr(pMac, cfgId, (tANI_U8 *)pBuf, cbLen, NULL, eANI_BOOLEAN_FALSE); 
+            ccmCfgSetStr(pMac, cfgId, (tANI_U8 *)pBuf, cbLen, NULL, eANI_BOOLEAN_FALSE);
         }
         vos_mem_free(pBuf);
     }//Allocate memory
@@ -7649,7 +7662,7 @@ void csrSetCfgCountryCode( tpAniSirGlobal pMac, tANI_U8 *countryCode )
 {
     tANI_U8 cc[WNI_CFG_COUNTRY_CODE_LEN];
     ///v_REGDOMAIN_t DomainId;
-    
+
     smsLog( pMac, LOG3, "Setting Country Code in Cfg from csrSetCfgCountryCode %s",countryCode );
     vos_mem_copy(cc, countryCode, WNI_CFG_COUNTRY_CODE_LEN);
 
@@ -7665,7 +7678,7 @@ void csrSetCfgCountryCode( tpAniSirGlobal pMac, tANI_U8 *countryCode )
     }
     ccmCfgSetStr(pMac, WNI_CFG_COUNTRY_CODE, cc, WNI_CFG_COUNTRY_CODE_LEN, NULL, eANI_BOOLEAN_FALSE);
 
-    //Need to let HALPHY know about the current domain so it can apply some 
+    //Need to let HALPHY know about the current domain so it can apply some
     //domain-specific settings (TX filter...)
     /*if(HAL_STATUS_SUCCESS(csrGetRegulatoryDomainForCountry(pMac, cc, &DomainId)))
     {
@@ -7689,15 +7702,15 @@ eHalStatus csrGetCountryCode(tpAniSirGlobal pMac, tANI_U8 *pBuf, tANI_U8 *pbLen)
             *pbLen = (tANI_U8)len;
         }
     }
-    
+
     return (status);
 }
 
 
 void csrSetCfgScanControlList( tpAniSirGlobal pMac, tANI_U8 *countryCode, tCsrChannel *pChannelList  )
-{   
+{
     tANI_U8 i, j;
-    tANI_BOOLEAN found=FALSE;  
+    tANI_BOOLEAN found=FALSE;
     tANI_U8 *pControlList = NULL;
     tANI_U32 len = WNI_CFG_SCAN_CONTROL_LIST_LEN;
 
@@ -7708,22 +7721,22 @@ void csrSetCfgScanControlList( tpAniSirGlobal pMac, tANI_U8 *countryCode, tCsrCh
         {
             for (i = 0; i < pChannelList->numChannels; i++)
             {
-                for (j = 0; j < len; j += 2) 
+                for (j = 0; j < len; j += 2)
                 {
-                    if (pControlList[j] == pChannelList->channelList[i]) 
+                    if (pControlList[j] == pChannelList->channelList[i])
                     {
                         found = TRUE;
                         break;
                     }
                 }
-                   
+
                 if (found)    // insert a pair(channel#, flag)
                 {
                     pControlList[j+1] = csrGetScanType(pMac, pControlList[j]);
                     found = FALSE;  // reset the flag
                 }
-                       
-            }            
+
+            }
 
             ccmCfgSetStr(pMac, WNI_CFG_SCAN_CONTROL_LIST, pControlList, len, NULL, eANI_BOOLEAN_FALSE);
         }//Successfully getting scan control list
@@ -7737,7 +7750,7 @@ eHalStatus csrSetCfgBackgroundScanPeriod(tpAniSirGlobal pMac, tANI_U32 bgPeriod)
 {
     return (ccmCfgSetInt(pMac, WNI_CFG_BACKGROUND_SCAN_PERIOD, bgPeriod, (tCcmCfgSetCallback) csrScanCcmCfgSetCallback, eANI_BOOLEAN_FALSE));
 }
-    
+
 
 void csrScanCcmCfgSetCallback(tHalHandle hHal, tANI_S32 result)
 {
@@ -7764,7 +7777,7 @@ void csrScanCcmCfgSetCallback(tHalHandle hHal, tANI_S32 result)
         {
             smsLog( pMac, LOGW, "CSR: Scan Completion called but SCAN command is not ACTIVE ..." );
         }
-    }   
+    }
     smeProcessPendingQueue( pMac );
 }
 
@@ -7773,7 +7786,7 @@ eHalStatus csrProcessSetBGScanParam(tpAniSirGlobal pMac, tSmeCmd *pCommand)
     eHalStatus status;
     tCsrBGScanRequest *pScanReq = &pCommand->u.scanCmd.u.bgScanRequest;
     tANI_U32 dataLen = sizeof( tANI_U8 ) * pScanReq->ChannelInfo.numOfChannels;
-        
+
     //***setcfg for background scan channel list
     status = ccmCfgSetInt(pMac, WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME, pScanReq->minChnTime, NULL, eANI_BOOLEAN_FALSE);
     status = ccmCfgSetInt(pMac, WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME, pScanReq->maxChnTime, NULL, eANI_BOOLEAN_FALSE);
@@ -7817,12 +7830,12 @@ eHalStatus csrProcessSetBGScanParam(tpAniSirGlobal pMac, tSmeCmd *pCommand)
         //No need to stop aging because IDLE scan is still running
         status = ccmCfgSetInt(pMac, WNI_CFG_BACKGROUND_SCAN_PERIOD, 0, NULL, eANI_BOOLEAN_FALSE);
     }
-    
+
     if(pScanReq->SSID.length > WNI_CFG_SSID_LEN)
     {
         pScanReq->SSID.length = WNI_CFG_SSID_LEN;
     }
-    
+
     status = ccmCfgSetStr(pMac, WNI_CFG_BG_SCAN_CHANNEL_LIST, pScanReq->ChannelInfo.ChannelList, dataLen, NULL, eANI_BOOLEAN_FALSE);
     status = ccmCfgSetStr(pMac, WNI_CFG_SSID, (tANI_U8 *)pScanReq->SSID.ssId, pScanReq->SSID.length, NULL, eANI_BOOLEAN_FALSE);
 
@@ -8041,7 +8054,7 @@ eHalStatus csrScanGetScanChannelInfo(tpAniSirGlobal pMac, tANI_U8 sessionId)
         if (pMac->fScanOffload)
             ((tSirSmeGetScanChanReq *)pMsg)->sessionId = sessionId;
         status = palSendMBMessage(pMac->hHdd, pMsg);
-    }                             
+    }
 
     return( status );
 }
@@ -8051,7 +8064,7 @@ tANI_BOOLEAN csrRoamIsValidChannel( tpAniSirGlobal pMac, tANI_U8 channel )
     tANI_BOOLEAN fValid = FALSE;
     tANI_U32 idxValidChannels;
     tANI_U32 len = pMac->roam.numValidChannels;
-    
+
     for ( idxValidChannels = 0; ( idxValidChannels < len ); idxValidChannels++ )
     {
        if ( channel == pMac->roam.validChannelList[ idxValidChannels ] )
@@ -8060,7 +8073,7 @@ tANI_BOOLEAN csrRoamIsValidChannel( tpAniSirGlobal pMac, tANI_U8 channel )
           break;
        }
     }
-        
+
     return fValid;
 }
 
@@ -8286,7 +8299,7 @@ void csrInitOccupiedChannelsList(tpAniSirGlobal pMac)
       pIes = (tDot11fBeaconIEs *)( pBssDesc->Result.pvIes );
 
       //At this time, pBssDescription->Result.pvIes may be NULL
-      if( !pIes && (!HAL_STATUS_SUCCESS(csrGetParsedBssDescriptionIEs(pMac, 
+      if( !pIes && (!HAL_STATUS_SUCCESS(csrGetParsedBssDescriptionIEs(pMac,
                     &pBssDesc->Result.BssDescriptor, &pIes))) )
       {
           continue;
@@ -8305,7 +8318,7 @@ void csrInitOccupiedChannelsList(tpAniSirGlobal pMac)
       pEntry = csrLLNext( &pMac->scan.scanResultList, pEntry, LL_ACCESS_NOLOCK );
   }//while
   csrLLUnlock(&pMac->scan.scanResultList);
-    
+
 }
 #endif
 
@@ -8404,4 +8417,3 @@ void UpdateCCKMTSF(tANI_U32 *timeStamp0, tANI_U32 *timeStamp1, tANI_U32 *incr)
     *timeStamp1 = (tANI_U32)((timeStamp64 >> 32) & 0xffffffff);
 }
 #endif
-
diff --git a/CORE/SME/src/csr/csrCmdProcess.c b/CORE/SME/src/csr/csrCmdProcess.c
index c15d3fecaa4c..49fc5b5a00d0 100644
--- a/CORE/SME/src/csr/csrCmdProcess.c
+++ b/CORE/SME/src/csr/csrCmdProcess.c
@@ -50,36 +50,36 @@ eHalStatus csrMsgProcessor( tpAniSirGlobal pMac,  void *pMsgBuf )
     tSirSmeRsp *pSmeRsp = (tSirSmeRsp *)pMsgBuf;
 
     smsLog( pMac, LOG2, "  Message %d[0x%04X] received in curState %d and substate %d",
-                pSmeRsp->messageType, pSmeRsp->messageType, 
+                pSmeRsp->messageType, pSmeRsp->messageType,
                 pMac->roam.curState[pSmeRsp->sessionId],
                 pMac->roam.curSubState[pSmeRsp->sessionId] );
 
     // Process the message based on the state of the roaming states...
-    
+
 #if defined( ANI_RTT_DEBUG )
     if(!pAdapter->fRttModeEnabled)
     {
-#endif//RTT    
+#endif//RTT
         switch (pMac->roam.curState[pSmeRsp->sessionId])
         {
-        case eCSR_ROAMING_STATE_SCANNING: 
+        case eCSR_ROAMING_STATE_SCANNING:
         {
             //Are we in scan state
 #if defined( ANI_EMUL_ASSOC )
             emulScanningStateMsgProcessor( pAdapter, pMBBufHdr );
 #else
             status = csrScanningStateMsgProcessor(pMac, pMsgBuf);
-#endif    
+#endif
             break;
         }
-        
-        case eCSR_ROAMING_STATE_JOINED: 
+
+        case eCSR_ROAMING_STATE_JOINED:
         {
             //are we in joined state
             csrRoamJoinedStateMsgProcessor( pMac, pMsgBuf );
             break;
         }
-        
+
         case eCSR_ROAMING_STATE_JOINING:
         {
             //are we in roaming states
@@ -90,10 +90,10 @@ eHalStatus csrMsgProcessor( tpAniSirGlobal pMac,  void *pMsgBuf )
             break;
         }
 
-        //For all other messages, we ignore it        
+        //For all other messages, we ignore it
         default:
         {
-            /*To work-around an issue where checking for set/remove key base on connection state is no longer 
+            /*To work-around an issue where checking for set/remove key base on connection state is no longer
             * workable due to failure or finding the condition meets both SAP and infra/IBSS requirement.
             */
             if( (eWNI_SME_SETCONTEXT_RSP == pSmeRsp->messageType) ||
@@ -108,9 +108,9 @@ eHalStatus csrMsgProcessor( tpAniSirGlobal pMac,  void *pMsgBuf )
             }
             break;
         }
-        
+
         }//switch
-        
+
 #if defined( ANI_RTT_DEBUG )
     }
 #endif//RTT
@@ -147,7 +147,7 @@ void csrFullPowerCallback(void *pv, eHalStatus status)
     tSmeCmd *pCommand;
 
     (void)status;
-    
+
     while( NULL != ( pEntry = csrLLRemoveHead( &pMac->roam.roamCmdPendingList, eANI_BOOLEAN_TRUE ) ) )
     {
         pCommand = GET_BASE_ADDR( pEntry, tSmeCmd, Link );
@@ -172,5 +172,3 @@ void csrFullPowerOffloadCallback(void *pv, tANI_U32 sessionId, eHalStatus status
     }
 
 }
-
-
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index 96ccd13bc9e6..f325807519f2 100644
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -25,12 +25,12 @@
  * to the Linux Foundation.
  */
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
+
 
-  
     \file csrInsideApi.h
-  
+
     Define interface only used by CSR.
 ========================================================================== */
 #ifndef CSR_INSIDE_API_H__
@@ -52,7 +52,7 @@
 
 #ifdef WLAN_AP_STA_CONCURRENCY
 #define CSR_PASSIVE_MAX_CHANNEL_TIME_CONC   110
-#define CSR_PASSIVE_MIN_CHANNEL_TIME_CONC   60 
+#define CSR_PASSIVE_MIN_CHANNEL_TIME_CONC   60
 
 #define CSR_ACTIVE_MAX_CHANNEL_TIME_CONC    27
 #define CSR_ACTIVE_MIN_CHANNEL_TIME_CONC    20
@@ -72,13 +72,13 @@
 
 //This number minus 1 means the number of times a channel is scanned before a BSS is remvoed from
 //cache scan result
-#define CSR_AGING_COUNT     3   
+#define CSR_AGING_COUNT     3
 //The following defines are used by palTimer
 //This is used for palTimer when request to imps fails
-#define CSR_IDLE_SCAN_WAIT_TIME     (1 * PAL_TIMER_TO_SEC_UNIT)     //1 second 
+#define CSR_IDLE_SCAN_WAIT_TIME     (1 * PAL_TIMER_TO_SEC_UNIT)     //1 second
 //This is used for palTimer when imps ps is disabled
 //This number shall not be smaller than 5-6 seconds in general because a full scan may take 3-4 seconds
-#define CSR_IDLE_SCAN_NO_PS_INTERVAL     (10 * PAL_TIMER_TO_SEC_UNIT)     //10 second 
+#define CSR_IDLE_SCAN_NO_PS_INTERVAL     (10 * PAL_TIMER_TO_SEC_UNIT)     //10 second
 #define CSR_IDLE_SCAN_NO_PS_INTERVAL_MIN (5 * PAL_TIMER_TO_SEC_UNIT)
 #define CSR_SCAN_GET_RESULT_INTERVAL    (5 * PAL_TIMER_TO_SEC_UNIT)     //5 seconds
 #define CSR_MIC_ERROR_TIMEOUT  (60 * PAL_TIMER_TO_SEC_UNIT)     //60 seconds
@@ -96,7 +96,7 @@
 #define CSR_BEST_RSSI_VALUE         (-30)   //RSSI >= this is in CAT4
 #define CSR_DEFAULT_RSSI_DB_GAP     30 //every 30 dbm for one category
 #define CSR_BSS_CAP_VALUE_NONE  0    //not much value
-#define CSR_BSS_CAP_VALUE_HT    2    
+#define CSR_BSS_CAP_VALUE_HT    2
 #define CSR_BSS_CAP_VALUE_WMM   1
 #define CSR_BSS_CAP_VALUE_UAPSD 1
 #if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
@@ -111,7 +111,7 @@
 #define CSR_JOIN_RETRY_TIMEOUT_PERIOD        ( 1 *  PAL_TIMER_TO_SEC_UNIT )  // 1 second
 #endif
 
-typedef enum 
+typedef enum
 {
     eCsrNextScanNothing,
     eCsrNextLostLinkScan1Success,
@@ -123,7 +123,7 @@ typedef enum
     eCsrNextLostLinkScan3Failed,
     eCsrNext11dScan1Failure,
     eCsrNext11dScan1Success,
-    eCsrNext11dScan2Failure, 
+    eCsrNext11dScan2Failure,
     eCsrNext11dScan2Success,
     eCsrNext11dScanComplete,
     eCsrNexteScanForSsidFailure,
@@ -132,20 +132,20 @@ typedef enum
 
 }eCsrScanCompleteNextCommand;
 
-typedef enum  
+typedef enum
 {
-    eCsrJoinSuccess, 
+    eCsrJoinSuccess,
     eCsrJoinFailure,
     eCsrReassocSuccess,
-    eCsrReassocFailure, 
-    eCsrNothingToJoin, 
+    eCsrReassocFailure,
+    eCsrNothingToJoin,
     eCsrStartBssSuccess,
     eCsrStartBssFailure,
     eCsrSilentlyStopRoaming,
     eCsrSilentlyStopRoamingSaveState,
     eCsrJoinWdsFailure,
     eCsrJoinFailureDueToConcurrency,
-    
+
 }eCsrRoamCompleteResult;
 
 typedef struct tagScanReqParam
@@ -165,9 +165,9 @@ typedef struct tagCsrScanResult
     tANI_U32 capValue;  //The biggger the better. This value is in use only if we have equal preferValue
     //This member must be the last in the structure because the end of tSirBssDescription (inside) is an
     //    array with nonknown size at this time
-    
+
     eCsrEncryptionType ucEncryptionType; //Preferred Encryption type that matched with profile.
-    eCsrEncryptionType mcEncryptionType; 
+    eCsrEncryptionType mcEncryptionType;
     eCsrAuthType authType; //Preferred auth type that matched with the profile.
 
     tCsrScanResultInfo Result;
@@ -208,14 +208,14 @@ void csrReleaseCommandRoam(tpAniSirGlobal pMac, tSmeCmd *pCommand);
 void csrReleaseCommandScan(tpAniSirGlobal pMac, tSmeCmd *pCommand);
 void csrReleaseCommandWmStatusChange(tpAniSirGlobal pMac, tSmeCmd *pCommand);
 //pIes2 can be NULL
-tANI_BOOLEAN csrIsDuplicateBssDescription( tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc1, 
+tANI_BOOLEAN csrIsDuplicateBssDescription( tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc1,
                                            tSirBssDescription *pSirBssDesc2, tDot11fBeaconIEs *pIes2, tANI_BOOLEAN fForced );
 eHalStatus csrRoamSaveConnectedBssDesc( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDescription *pBssDesc );
 tANI_BOOLEAN csrIsNetworkTypeEqual( tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2 );
 eHalStatus csrScanSmeScanResponse( tpAniSirGlobal pMac, void *pMsgBuf );
 /*
    Prepare a filter base on a profile for parsing the scan results.
-   Upon successful return, caller MUST call csrFreeScanFilter on 
+   Upon successful return, caller MUST call csrFreeScanFilter on
    pScanFilter when it is done with the filter.
 */
 eHalStatus csrRoamPrepareFilterFromProfile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tCsrScanResultFilter *pScanFilter);
@@ -235,7 +235,7 @@ eHalStatus csrScanRequestLostLink3( tpAniSirGlobal pMac, tANI_U32 sessionId );
 eHalStatus csrScanHandleFailedLostlink1(tpAniSirGlobal pMac, tANI_U32 sessionId);
 eHalStatus csrScanHandleFailedLostlink2(tpAniSirGlobal pMac, tANI_U32 sessionId);
 eHalStatus csrScanHandleFailedLostlink3(tpAniSirGlobal pMac, tANI_U32 sessionId);
-tCsrScanResult *csrScanAppendBssDescription( tpAniSirGlobal pMac, 
+tCsrScanResult *csrScanAppendBssDescription( tpAniSirGlobal pMac,
                                              tSirBssDescription *pSirBssDescription,
                                              tDot11fBeaconIEs *pIes, tANI_BOOLEAN fForced);
 void csrScanCallCallback(tpAniSirGlobal pMac, tSmeCmd *pCommand, eCsrScanStatus scanStatus);
@@ -255,7 +255,7 @@ eHalStatus csrScanBGScanEnable(tpAniSirGlobal pMac);
 eHalStatus csrScanStartIdleScanTimer(tpAniSirGlobal pMac, tANI_U32 interval);
 eHalStatus csrScanStopIdleScanTimer(tpAniSirGlobal pMac);
 eHalStatus csrScanStartIdleScan(tpAniSirGlobal pMac);
-//Param: pTimeInterval -- Caller allocated memory in return, if failed, to specify the nxt time interval for 
+//Param: pTimeInterval -- Caller allocated memory in return, if failed, to specify the nxt time interval for
 //idle scan timer interval
 //Return: Not success -- meaning it cannot start IMPS, caller needs to start a timer for idle scan
 eHalStatus csrScanTriggerIdleScan(tpAniSirGlobal pMac, tANI_U32 *pTimeInterval);
@@ -266,7 +266,7 @@ tANI_BOOLEAN csrScanRemoveNotRoamingScanCommand(tpAniSirGlobal pMac);
 //To remove fresh scan commands from the pending queue
 tANI_BOOLEAN csrScanRemoveFreshScanCommand(tpAniSirGlobal pMac, tANI_U8 sessionId);
 eHalStatus csrScanAbortMacScan(tpAniSirGlobal pMac, tANI_U8 sessionId);
-void csrRemoveCmdFromPendingList(tpAniSirGlobal pMac, tDblLinkList *pList, 
+void csrRemoveCmdFromPendingList(tpAniSirGlobal pMac, tDblLinkList *pList,
                                               eSmeCommandType commandType );
 void csrRemoveCmdWithSessionIdFromPendingList(tpAniSirGlobal pMac,
                                               tANI_U8 sessionId,
@@ -291,29 +291,29 @@ void csrSetCfgScanControlList( tpAniSirGlobal pMac, tANI_U8 *countryCode, tCsrCh
 void csrReinitScanCmd(tpAniSirGlobal pMac, tSmeCmd *pCommand);
 void csrFreeScanResultEntry( tpAniSirGlobal pMac, tCsrScanResult *pResult );
 
-eHalStatus csrRoamCallCallback(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamInfo *pRoamInfo, 
+eHalStatus csrRoamCallCallback(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamInfo *pRoamInfo,
                                tANI_U32 roamId, eRoamCmdStatus u1, eCsrRoamResult u2);
-eHalStatus csrRoamIssueConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
-                               tScanResultHandle hBSSList, 
-                               eCsrRoamReason reason, tANI_U32 roamId, 
+eHalStatus csrRoamIssueConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
+                               tScanResultHandle hBSSList,
+                               eCsrRoamReason reason, tANI_U32 roamId,
                                tANI_BOOLEAN fImediate, tANI_BOOLEAN fClearScan);
 eHalStatus csrRoamIssueReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                                tCsrRoamModifyProfileFields *pModProfileFields,
                                eCsrRoamReason reason, tANI_U32 roamId, tANI_BOOLEAN fImediate);
 void csrRoamComplete( tpAniSirGlobal pMac, eCsrRoamCompleteResult Result, void *Context );
-eHalStatus csrRoamIssueSetContextReq( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrEncryptionType EncryptType, 
+eHalStatus csrRoamIssueSetContextReq( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrEncryptionType EncryptType,
                                      tSirBssDescription *pBssDescription,
                                 tSirMacAddr *bssId, tANI_BOOLEAN addKey,
-                                 tANI_BOOLEAN fUnicast, tAniKeyDirection aniKeyDirection, 
-                                 tANI_U8 keyId, tANI_U16 keyLength, 
+                                 tANI_BOOLEAN fUnicast, tAniKeyDirection aniKeyDirection,
+                                 tANI_U8 keyId, tANI_U16 keyLength,
                                  tANI_U8 *pKey, tANI_U8 paeRole );
-eHalStatus csrRoamProcessDisassocDeauth( tpAniSirGlobal pMac, tSmeCmd *pCommand, 
+eHalStatus csrRoamProcessDisassocDeauth( tpAniSirGlobal pMac, tSmeCmd *pCommand,
                                          tANI_BOOLEAN fDisassoc, tANI_BOOLEAN fMICFailure );
-eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                                           tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes);
 void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg );
 void csrRoamStatsRspProcessor(tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg);
-eHalStatus csrRoamIssueStartBss( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamStartBssParams *pParam, 
+eHalStatus csrRoamIssueStartBss( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamStartBssParams *pParam,
                                  tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, tANI_U32 roamId );
 eHalStatus csrRoamIssueStopBss( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamSubState NewSubstate );
 tANI_BOOLEAN csrIsSameProfile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pProfile1, tCsrRoamProfile *pProfile2);
@@ -327,8 +327,8 @@ eHalStatus csrRoamIssueDisassociateCmd( tpAniSirGlobal pMac, tANI_U32 sessionId,
 eHalStatus csrRoamDisconnectInternal(tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamDisconnectReason reason);
 //pCommand may be NULL
 void csrRoamRemoveDuplicateCommand(tpAniSirGlobal pMac, tANI_U32 sessionId, tSmeCmd *pCommand, eCsrRoamReason eRoamReason);
-                                 
-eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDescription *pBssDescription, 
+
+eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDescription *pBssDescription,
                               tCsrRoamProfile *pProfile, tDot11fBeaconIEs *pIes, tANI_U16 messageType );
 eHalStatus csrSendMBDisassocReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirMacAddr bssId, tANI_U16 reasonCode );
 eHalStatus csrSendMBDeauthReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirMacAddr bssId, tANI_U16 reasonCode );
@@ -336,13 +336,13 @@ eHalStatus csrSendMBDisassocCnfMsg( tpAniSirGlobal pMac, tpSirSmeDisassocInd pDi
 eHalStatus csrSendMBDeauthCnfMsg( tpAniSirGlobal pMac, tpSirSmeDeauthInd pDeauthInd );
 eHalStatus csrSendAssocCnfMsg( tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, eHalStatus status );
 eHalStatus csrSendAssocIndToUpperLayerCnfMsg( tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, eHalStatus Halstatus, tANI_U8 sessionId );
-eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamBssType bssType, 
+eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamBssType bssType,
                                     tCsrRoamStartBssParams *pParam, tSirBssDescription *pBssDesc );
 eHalStatus csrSendMBStopBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId );
 
 tANI_BOOLEAN csrIsMacAddressEqual( tpAniSirGlobal pMac, tCsrBssid *pMacAddr1, tCsrBssid *pMacAddr2 );
 //Caller should put the BSS' ssid to fiedl bssSsid when comparing SSID for a BSS.
-tANI_BOOLEAN csrIsSsidMatch( tpAniSirGlobal pMac, tANI_U8 *ssid1, tANI_U8 ssid1Len, tANI_U8 *bssSsid, 
+tANI_BOOLEAN csrIsSsidMatch( tpAniSirGlobal pMac, tANI_U8 *ssid1, tANI_U8 ssid1Len, tANI_U8 *bssSsid,
                             tANI_U8 bssSsidLen, tANI_BOOLEAN fSsidRequired );
 tANI_BOOLEAN csrIsPhyModeMatch( tpAniSirGlobal pMac, tANI_U32 phyMode,
                                     tSirBssDescription *pSirBssDesc, tCsrRoamProfile *pProfile,
@@ -410,7 +410,7 @@ eHalStatus csrRoamOpenSession(tpAniSirGlobal pMac,
                               tANI_U32 type, tANI_U32 subType );
 //fSync: TRUE means cleanupneeds to handle synchronously.
 eHalStatus csrRoamCloseSession( tpAniSirGlobal pMac, tANI_U32 sessionId,
-                                tANI_BOOLEAN fSync, 
+                                tANI_BOOLEAN fSync,
                                 csrRoamSessionCloseCallback callback,
                                 void *pContext );
 void csrCleanupSession(tpAniSirGlobal pMac, tANI_U32 sessionId);
@@ -421,16 +421,16 @@ eCsrCfgDot11Mode csrFindBestPhyMode( tpAniSirGlobal pMac, tANI_U32 phyMode );
     \fn csrScanEnable
     \brief Enable the scanning feature of CSR. It must be called before any scan request can be performed.
     \param tHalHandle - HAL context handle
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrScanEnable(tpAniSirGlobal);
 
 /* ---------------------------------------------------------------------------
     \fn csrScanDisable
-    \brief Disableing the scanning feature of CSR. After this function return success, no scan is performed until 
+    \brief Disableing the scanning feature of CSR. After this function return success, no scan is performed until
 a successfull to csrScanEnable
     \param tHalHandle - HAL context handle
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrScanDisable(tpAniSirGlobal);
 /* ---------------------------------------------------------------------------
@@ -439,7 +439,7 @@ eHalStatus csrScanDisable(tpAniSirGlobal);
     \param pScanRequestID - pointer to an object to get back the request ID
     \param callback - a callback function that scan calls upon finish, will not be called if csrScanRequest returns error
     \param pContext - a pointer passed in for the callback
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrScanRequest(tpAniSirGlobal, tANI_U16, tCsrScanRequest *,
                    tANI_U32 *pScanRequestID, csrScanCompleteCallback callback,
@@ -449,7 +449,7 @@ eHalStatus csrScanRequest(tpAniSirGlobal, tANI_U16, tCsrScanRequest *,
     \fn csrScanAbort
     \brief If a scan request is abort, the scan complete callback will be called first before csrScanAbort returns.
     \param pScanRequestID - The request ID returned from csrScanRequest
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrScanAbort(tpAniSirGlobal, tANI_U32 scanRequestID);
 
@@ -461,21 +461,21 @@ eHalStatus csrScanBGScanAbort(tpAniSirGlobal);
     \brief Return scan results.
     \param pFilter - If pFilter is NULL, all cached results are returned
     \param phResult - an object for the result.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrScanGetResult(tpAniSirGlobal, tCsrScanResultFilter *pFilter, tScanResultHandle *phResult);
 
 /* ---------------------------------------------------------------------------
     \fn csrScanFlushResult
     \brief Clear scan results.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrScanFlushResult(tpAniSirGlobal);
 eHalStatus csrScanFlushSelectiveResult(tpAniSirGlobal, v_BOOL_t flushP2P);
 /* ---------------------------------------------------------------------------
     \fn csrScanBGScanGetParam
     \brief Returns the current background scan settings.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrScanBGScanGetParam(tpAniSirGlobal, tCsrBGScanRequest *);
 
@@ -483,14 +483,14 @@ eHalStatus csrScanBGScanGetParam(tpAniSirGlobal, tCsrBGScanRequest *);
     \fn csrScanResultGetFirst
     \brief Returns the first element of scan result.
     \param hScanResult - returned from csrScanGetResult
-    \return tCsrScanResultInfo * - NULL if no result     
+    \return tCsrScanResultInfo * - NULL if no result
   -------------------------------------------------------------------------------*/
 tCsrScanResultInfo *csrScanResultGetFirst(tpAniSirGlobal, tScanResultHandle hScanResult);
 /* ---------------------------------------------------------------------------
     \fn csrScanResultGetNext
     \brief Returns the next element of scan result. It can be called without calling csrScanResultGetFirst first
     \param hScanResult - returned from csrScanGetResult
-    \return Null if no result or reach the end     
+    \return Null if no result or reach the end
   -------------------------------------------------------------------------------*/
 tCsrScanResultInfo *csrScanResultGetNext(tpAniSirGlobal, tScanResultHandle hScanResult);
 
@@ -500,7 +500,7 @@ tCsrScanResultInfo *csrScanResultGetNext(tpAniSirGlobal, tScanResultHandle hScan
     \param pBuf - Caller allocated buffer with at least 3 bytes, upon success return, this has the country code
     \param pbLen - Caller allocated, as input, it indicates the length of pBuf. Upon success return,
     this contains the length of the data in pBuf
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrGetCountryCode(tpAniSirGlobal pMac, tANI_U8 *pBuf, tANI_U8 *pbLen);
 
@@ -509,9 +509,9 @@ eHalStatus csrGetCountryCode(tpAniSirGlobal pMac, tANI_U8 *pBuf, tANI_U8 *pbLen)
     \brief this function is to set the country code so channel/power setting matches the countrycode and
     the domain it belongs to.
     \param pCountry - Caller allocated buffer with at least 3 bytes specifying the country code
-    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether 
+    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether
     a restart is needed to apply the change
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrSetCountryCode(tpAniSirGlobal pMac, tANI_U8 *pCountry, tANI_BOOLEAN *pfRestartNeeded);
 
@@ -519,21 +519,21 @@ eHalStatus csrSetCountryCode(tpAniSirGlobal pMac, tANI_U8 *pCountry, tANI_BOOLEA
     \fn csrResetCountryCodeInformation
     \brief this function is to reset the country code current being used back to EEPROM default
     this includes channel list and power setting.
-    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether 
+    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether
     a restart is needed to apply the change
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrResetCountryCodeInformation(tpAniSirGlobal pMac, tANI_BOOLEAN *pfRestartNeeded);
 
 /* ---------------------------------------------------------------------------
     \fn csrGetSupportedCountryCode
     \brief this function is to get a list of the country code current being supported
-    \param pBuf - Caller allocated buffer with at least 3 bytes, upon success return, 
+    \param pBuf - Caller allocated buffer with at least 3 bytes, upon success return,
     this has the country code list. 3 bytes for each country code. This may be NULL if
     caller wants to know the needed bytes.
     \param pbLen - Caller allocated, as input, it indicates the length of pBuf. Upon success return,
     this contains the length of the data in pBuf
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrGetSupportedCountryCode(tpAniSirGlobal pMac, tANI_U8 *pBuf, tANI_U32 *pbLen);
 
@@ -542,11 +542,11 @@ eHalStatus csrGetSupportedCountryCode(tpAniSirGlobal pMac, tANI_U8 *pBuf, tANI_U
     \brief this function is to set the current regulatory domain.
     This function must be called after CFG is downloaded and all the band/mode setting already passed into
     CSR.
-    \param domainId - indicate the domain (defined in the driver) needs to set to.  
+    \param domainId - indicate the domain (defined in the driver) needs to set to.
     See eRegDomainId for definition
-    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether 
+    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether
     a restart is needed to apply the change
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrSetRegulatoryDomain(tpAniSirGlobal pMac, v_REGDOMAIN_t domainId, tANI_BOOLEAN *pfRestartNeeded);
 
@@ -555,7 +555,7 @@ eHalStatus csrSetRegulatoryDomain(tpAniSirGlobal pMac, v_REGDOMAIN_t domainId, t
     \brief this function is to get the current regulatory domain.
     This function must be called after CFG is downloaded and all the band/mode setting already passed into
     CSR.
-    \return eRegDomainId     
+    \return eRegDomainId
   -------------------------------------------------------------------------------*/
 v_REGDOMAIN_t csrGetCurrentRegulatoryDomain(tpAniSirGlobal pMac);
 
@@ -567,7 +567,7 @@ v_REGDOMAIN_t csrGetCurrentRegulatoryDomain(tpAniSirGlobal pMac);
     \param pCountry - Caller allocated buffer with at least 3 bytes specifying the country code
     \param pDomainId - Caller allocated buffer to get the return domain ID upon success return. Can be NULL.
     \param source - the source of country information.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrGetRegulatoryDomainForCountry(tpAniSirGlobal pMac,
                                             tANI_U8 *pCountry,
@@ -605,7 +605,7 @@ tANI_BOOLEAN csrIsProfileWapi( tCsrRoamProfile *pProfile );
 #define WLAN_SECURITY_EVENT_REMOVE_KEY_RSP  6
 #define WLAN_SECURITY_EVENT_PMKID_CANDIDATE_FOUND  7
 #define WLAN_SECURITY_EVENT_PMKID_UPDATE    8
-#define WLAN_SECURITY_EVENT_MIC_ERROR       9   
+#define WLAN_SECURITY_EVENT_MIC_ERROR       9
 
 #define AUTH_OPEN       0
 #define AUTH_SHARED     1
@@ -676,9 +676,9 @@ int diagEncTypeFromCSRType(eCsrEncryptionType encType);
 /* ---------------------------------------------------------------------------
     \fn csrScanResultPurge
     \brief remove all items(tCsrScanResult) in the list and free memory for each item
-    \param hScanResult - returned from csrScanGetResult. hScanResult is considered gone by 
+    \param hScanResult - returned from csrScanGetResult. hScanResult is considered gone by
     calling this function and even before this function reutrns.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrScanResultPurge(tpAniSirGlobal pMac, tScanResultHandle hScanResult);
 
@@ -691,22 +691,22 @@ eHalStatus csrScanResultPurge(tpAniSirGlobal pMac, tScanResultHandle hScanResult
     \param pProfile - can be NULL to join to any open ones
     \param hBssListIn - a list of BSS descriptor to roam to. It is returned from csrScanGetResult
     \param pRoamId - to get back the request ID
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
-eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                           tScanResultHandle hBssListIn, tANI_U32 *pRoamId);
 
 /* ---------------------------------------------------------------------------
     \fn csrRoamReassoc
     \brief To inititiate a re-association
-    \param pProfile - can be NULL to join the currently connected AP. In that 
+    \param pProfile - can be NULL to join the currently connected AP. In that
     case modProfileFields should carry the modified field(s) which could trigger
-    reassoc  
-    \param modProfileFields - fields which are part of tCsrRoamConnectedProfile 
-    that might need modification dynamically once STA is up & running and this 
+    reassoc
+    \param modProfileFields - fields which are part of tCsrRoamConnectedProfile
+    that might need modification dynamically once STA is up & running and this
     could trigger a reassoc
     \param pRoamId - to get back the request ID
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrRoamReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                           tCsrRoamModifyProfileFields modProfileFields,
@@ -716,7 +716,7 @@ eHalStatus csrRoamReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi
 /* ---------------------------------------------------------------------------
     \fn csrRoamReconnect
     \brief To disconnect and reconnect with the same profile
-    \return eHalStatus. It returns fail if currently not connected     
+    \return eHalStatus. It returns fail if currently not connected
   -------------------------------------------------------------------------------*/
 eHalStatus csrRoamReconnect(tpAniSirGlobal pMac, tANI_U32 sessionId);
 
@@ -735,7 +735,7 @@ eHalStatus csrRoamSetPMKIDCache( tpAniSirGlobal pMac, tANI_U32 sessionId, tPmkid
 /* ---------------------------------------------------------------------------
     \fn csrRoamGetWpaRsnReqIE
     \brief return the WPA or RSN IE CSR passes to PE to JOIN request or START_BSS request
-    \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the 
+    \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the
     needed or IE length in pBuf.
     \param pBuf - Caller allocated memory that contain the IE field, if any, upon return
     \return eHalStatus - when fail, it usually means the buffer allocated is not big enough
@@ -745,7 +745,7 @@ eHalStatus csrRoamGetWpaRsnReqIE(tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U
 /* ---------------------------------------------------------------------------
     \fn csrRoamGetWpaRsnRspIE
     \brief return the WPA or RSN IE from the beacon or probe rsp if connected
-    \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the 
+    \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the
     needed or IE length in pBuf.
     \param pBuf - Caller allocated memory that contain the IE field, if any, upon return
     \return eHalStatus - when fail, it usually means the buffer allocated is not big enough
@@ -763,12 +763,12 @@ tANI_U32 csrRoamGetNumPMKIDCache(tpAniSirGlobal pMac, tANI_U32 sessionId);
 /* ---------------------------------------------------------------------------
     \fn csrRoamGetPMKIDCache
     \brief return PMKID cache from CSR
-    \param pNum - caller allocated memory that has the space of the number of pBuf tPmkidCacheInfo as input. Upon returned, *pNum has the 
+    \param pNum - caller allocated memory that has the space of the number of pBuf tPmkidCacheInfo as input. Upon returned, *pNum has the
     needed or actually number in tPmkidCacheInfo.
     \param pPmkidCache - Caller allocated memory that contains PMKID cache, if any, upon return
     \return eHalStatus - when fail, it usually means the buffer allocated is not big enough
   -------------------------------------------------------------------------------*/
-eHalStatus csrRoamGetPMKIDCache(tpAniSirGlobal pMac, tANI_U32 sessionId, 
+eHalStatus csrRoamGetPMKIDCache(tpAniSirGlobal pMac, tANI_U32 sessionId,
                                 tANI_U32 *pNum, tPmkidCacheInfo *pPmkidCache);
 
 /* ---------------------------------------------------------------------------
@@ -776,15 +776,15 @@ eHalStatus csrRoamGetPMKIDCache(tpAniSirGlobal pMac, tANI_U32 sessionId,
     \brief To return the current connect profile. Caller must call csrRoamFreeConnectProfile
            after it is done and before reuse for another csrRoamGetConnectProfile call.
     \param pProfile - pointer to a caller allocated structure tCsrRoamConnectedProfile
-    \return eHalStatus. Failure if not connected     
+    \return eHalStatus. Failure if not connected
   -------------------------------------------------------------------------------*/
-eHalStatus csrRoamGetConnectProfile(tpAniSirGlobal pMac, tANI_U32 sessionId, 
+eHalStatus csrRoamGetConnectProfile(tpAniSirGlobal pMac, tANI_U32 sessionId,
                                     tCsrRoamConnectedProfile *pProfile);
 
 /* ---------------------------------------------------------------------------
     \fn csrRoamGetConnectState
     \brief To return the current connect state of Roaming
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrRoamGetConnectState(tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrConnectState *pState);
 
@@ -792,7 +792,7 @@ eHalStatus csrRoamGetConnectState(tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrC
     \fn csrRoamFreeConnectProfile
     \brief To free and reinitialize the profile return previous by csrRoamGetConnectProfile.
     \param pProfile - pointer to a caller allocated structure tCsrRoamConnectedProfile
-    \return eHalStatus.      
+    \return eHalStatus.
   -------------------------------------------------------------------------------*/
 eHalStatus csrRoamFreeConnectProfile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pProfile);
 
@@ -801,35 +801,35 @@ eHalStatus csrRoamFreeConnectProfile(tpAniSirGlobal pMac, tCsrRoamConnectedProfi
     \brief HDD calls this function to set the WNI_CFG_VALID_CHANNEL_LIST base on the band/mode settings.
     This function must be called after CFG is downloaded and all the band/mode setting already passed into
     CSR.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrInitChannelList( tHalHandle hHal );
 
 /* ---------------------------------------------------------------------------
     \fn csrChangeConfigParams
-    \brief The CSR API exposed for HDD to provide config params to CSR during 
+    \brief The CSR API exposed for HDD to provide config params to CSR during
     SMEs stop -> start sequence.
-    If HDD changed the domain that will cause a reset. This function will 
+    If HDD changed the domain that will cause a reset. This function will
     provide the new set of 11d information for the new domain. Currrently this
     API provides info regarding 11d only at reset but we can extend this for
     other params (PMC, QoS) which needs to be initialized again at reset.
-    \param 
-    hHal - Handle to the HAL. The HAL handle is returned by the HAL after it is 
+    \param
+    hHal - Handle to the HAL. The HAL handle is returned by the HAL after it is
            opened (by calling halOpen).
-    pUpdateConfigParam - a pointer to a structure (tCsrUpdateConfigParam) that 
-                currently provides 11d related information like Country code, 
-                Regulatory domain, valid channel list, Tx power per channel, a 
-                list with active/passive scan allowed per valid channel. 
+    pUpdateConfigParam - a pointer to a structure (tCsrUpdateConfigParam) that
+                currently provides 11d related information like Country code,
+                Regulatory domain, valid channel list, Tx power per channel, a
+                list with active/passive scan allowed per valid channel.
 
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus csrChangeConfigParams(tpAniSirGlobal pMac, 
+eHalStatus csrChangeConfigParams(tpAniSirGlobal pMac,
                                  tCsrUpdateConfigParam *pUpdateConfigParam);
 
 /* ---------------------------------------------------------------------------
     \fn csrRoamConnectToLastProfile
     \brief To disconnect and reconnect with the same profile
-    \return eHalStatus. It returns fail if currently connected     
+    \return eHalStatus. It returns fail if currently connected
   -------------------------------------------------------------------------------*/
 eHalStatus csrRoamConnectToLastProfile(tpAniSirGlobal pMac, tANI_U32 sessionId);
 
@@ -837,7 +837,7 @@ eHalStatus csrRoamConnectToLastProfile(tpAniSirGlobal pMac, tANI_U32 sessionId);
     \fn csrRoamDisconnect
     \brief To disconnect from a network
     \param reason -- To indicate the reason for disconnecting. Currently, only eCSR_DISCONNECT_REASON_MIC_ERROR is meanful.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrRoamDisconnect(tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamDisconnectReason reason);
 
@@ -858,7 +858,7 @@ eHalStatus csrScanGetPMKIDCandidateList(tpAniSirGlobal pMac, tANI_U32 sessionId,
 //doesn't have any logic other than blindly trying to stop BSS
 eHalStatus csrRoamIssueStopBssCmd( tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_BOOLEAN fHighPriority );
 
-void csrCallRoamingCompletionCallback(tpAniSirGlobal pMac, tCsrRoamSession *pSession, 
+void csrCallRoamingCompletionCallback(tpAniSirGlobal pMac, tCsrRoamSession *pSession,
                                       tCsrRoamInfo *pRoamInfo, tANI_U32 roamId, eCsrRoamResult roamResult);
 
 /* ---------------------------------------------------------------------------
@@ -869,8 +869,8 @@ void csrCallRoamingCompletionCallback(tpAniSirGlobal pMac, tCsrRoamSession *pSes
     \param reason - reason code, be one of the tSirMacReasonCodes
     \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus csrRoamIssueDisassociateStaCmd( tpAniSirGlobal pMac, 
-                                           tANI_U32 sessionId, 
+eHalStatus csrRoamIssueDisassociateStaCmd( tpAniSirGlobal pMac,
+                                           tANI_U32 sessionId,
                                            tANI_U8 *pPeerMacAddr,
                                            tANI_U32 reason);
 
@@ -882,8 +882,8 @@ eHalStatus csrRoamIssueDisassociateStaCmd( tpAniSirGlobal pMac,
     \param reason - reason code, be one of the tSirMacReasonCodes
     \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus csrRoamIssueDeauthStaCmd( tpAniSirGlobal pMac, 
-                                     tANI_U32 sessionId, 
+eHalStatus csrRoamIssueDeauthStaCmd( tpAniSirGlobal pMac,
+                                     tANI_U32 sessionId,
                                      tANI_U8 *pPeerMacAddr,
                                      tANI_U32 reason);
 
@@ -925,7 +925,7 @@ eHalStatus csrSendMBGetAssociatedStasReqMsg( tpAniSirGlobal pMac, tANI_U32 sessi
   ---------------------------------------------------------------------------*/
 eHalStatus csrRoamGetWpsSessionOverlap( tpAniSirGlobal pMac, tANI_U32 sessionId,
                              void *pUsrContext, void *pfnSapEventCallback,v_MACADDR_t pRemoveMac );
-                                        
+
 eHalStatus csrSendMBGetWPSPBCSessions( tpAniSirGlobal pMac, tANI_U32 sessionId,
                             tSirMacAddr bssId, void *pUsrContext, void *pfnSapEventCallback,v_MACADDR_t pRemoveMac);
 
@@ -945,7 +945,7 @@ eHalStatus csrRoamStopJoinRetryTimer(tpAniSirGlobal pMac, tANI_U32 sessionId);
 #ifdef WLAN_FEATURE_VOWIFI_11R
 /* ---------------------------------------------------------------------------
     \fn csrRoamFTPreAuthRspProcessor
-    \brief csr function that handles pre auth response from LIM 
+    \brief csr function that handles pre auth response from LIM
   ---------------------------------------------------------------------------*/
 void csrRoamFTPreAuthRspProcessor( tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuthRsp );
 #endif
@@ -980,4 +980,3 @@ eHalStatus csrUpdateChannelList(tCsrScanStruct *pScan);
 eHalStatus csrRoamDelPMKIDfromCache( tpAniSirGlobal pMac, tANI_U32 sessionId,
                                  tANI_U8 *pBSSId );
 #endif
-
diff --git a/CORE/SME/src/csr/csrLinkList.c b/CORE/SME/src/csr/csrLinkList.c
index da5e40bb28f9..8a81a344e4b1 100644
--- a/CORE/SME/src/csr/csrLinkList.c
+++ b/CORE/SME/src/csr/csrLinkList.c
@@ -25,10 +25,10 @@
  * to the Linux Foundation.
  */
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
     \file csrLinkList.c
-  
+
     Implementation for the Common link list interfaces.
 ========================================================================== */
 
@@ -50,7 +50,7 @@ ANI_INLINE_FUNCTION void csrListRemoveEntry(tListElem *pEntry)
 {
     tListElem *pLast;
     tListElem *pNext;
-    
+
     pLast = pEntry->last;
     pNext = pEntry->next;
     pLast->next = pNext;
@@ -62,12 +62,12 @@ ANI_INLINE_FUNCTION tListElem * csrListRemoveHead(tListElem *pHead)
 {
     tListElem *pEntry;
     tListElem *pNext;
-    
+
     pEntry = pHead->next;
     pNext = pEntry->next;
     pHead->next = pNext;
     pNext->last = pHead;
-    
+
     return (pEntry);
 }
 
@@ -77,12 +77,12 @@ ANI_INLINE_FUNCTION tListElem * csrListRemoveTail(tListElem *pHead)
 {
     tListElem *pEntry;
     tListElem *pLast;
-    
+
     pEntry = pHead->last;
     pLast = pEntry->last;
     pHead->last = pLast;
     pLast->next = pHead;
-    
+
     return (pEntry);
 }
 
@@ -90,7 +90,7 @@ ANI_INLINE_FUNCTION tListElem * csrListRemoveTail(tListElem *pHead)
 ANI_INLINE_FUNCTION void csrListInsertTail(tListElem *pHead, tListElem *pEntry)
 {
     tListElem *pLast;
-    
+
     pLast = pHead->last;
     pEntry->last = pLast;
     pEntry->next = pHead;
@@ -102,7 +102,7 @@ ANI_INLINE_FUNCTION void csrListInsertTail(tListElem *pHead, tListElem *pEntry)
 ANI_INLINE_FUNCTION void csrListInsertHead(tListElem *pHead, tListElem *pEntry)
 {
     tListElem *pNext;
-    
+
     pNext = pHead->next;
     pEntry->next = pNext;
     pEntry->last = pHead;
@@ -115,12 +115,12 @@ ANI_INLINE_FUNCTION void csrListInsertHead(tListElem *pHead, tListElem *pEntry)
 void csrListInsertEntry(tListElem *pEntry, tListElem *pNewEntry)
 {
     tListElem *pLast;
-    if( !pEntry) 
+    if( !pEntry)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pEntry is Null", __func__);
-        return; 
+        return;
     }
-       
+
     pLast = pEntry->last;
     pLast->next = pNewEntry;
     pEntry->last = pNewEntry;
@@ -128,34 +128,34 @@ void csrListInsertEntry(tListElem *pEntry, tListElem *pNewEntry)
     pNewEntry->last = pLast;
 }
 
-tANI_U32 csrLLCount( tDblLinkList *pList ) 
+tANI_U32 csrLLCount( tDblLinkList *pList )
 {
-    tANI_U32 c = 0; 
-    
+    tANI_U32 c = 0;
 
-    if( !pList) 
+
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return c; 
+        return c;
     }
 
-    if ( pList && ( LIST_FLAG_OPEN == pList->Flag ) ) 
+    if ( pList && ( LIST_FLAG_OPEN == pList->Flag ) )
     {
         c = pList->Count;
     }
 
-    return( c ); 
+    return( c );
 }
 
 
-void csrLLLock( tDblLinkList *pList ) 
+void csrLLLock( tDblLinkList *pList )
 {
-    
 
-    if( !pList) 
+
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return ; 
+        return ;
     }
 
     if ( LIST_FLAG_OPEN == pList->Flag )
@@ -167,14 +167,14 @@ void csrLLLock( tDblLinkList *pList )
 
 void csrLLUnlock( tDblLinkList *pList )
 {
-    
-    if( !pList) 
+
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return ; 
+        return ;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
         vos_lock_release(&pList->Lock);
     }
@@ -185,14 +185,14 @@ tANI_BOOLEAN csrLLIsListEmpty( tDblLinkList *pList, tANI_BOOLEAN fInterlocked )
 {
     tANI_BOOLEAN fEmpty = eANI_BOOLEAN_TRUE;
 
-    
-    if( !pList) 
+
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return fEmpty ; 
+        return fEmpty ;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
         if(fInterlocked)
         {
@@ -200,7 +200,7 @@ tANI_BOOLEAN csrLLIsListEmpty( tDblLinkList *pList, tANI_BOOLEAN fInterlocked )
         }
 
         fEmpty = csrIsListEmpty( &pList->ListHead );
-         
+
         if(fInterlocked)
         {
             csrLLUnlock(pList);
@@ -216,30 +216,30 @@ tANI_BOOLEAN csrLLFindEntry( tDblLinkList *pList, tListElem *pEntryToFind )
     tANI_BOOLEAN fFound = eANI_BOOLEAN_FALSE;
     tListElem *pEntry;
 
-    
-    if( !pList) 
+
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return fFound ; 
+        return fFound ;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
         pEntry = csrLLPeekHead( pList, LL_ACCESS_NOLOCK);
 
         // Have to make sure we don't loop back to the head of the list, which will
         // happen if the entry is NOT on the list...
-    
-        while( pEntry && ( pEntry != &pList->ListHead ) ) 
+
+        while( pEntry && ( pEntry != &pList->ListHead ) )
         {
-            if ( pEntry == pEntryToFind ) 
+            if ( pEntry == pEntryToFind )
             {
                 fFound = eANI_BOOLEAN_TRUE;
                 break;
             }
             pEntry = pEntry->next;
         }
-        
+
     }
     return( fFound );
 }
@@ -249,14 +249,14 @@ eHalStatus csrLLOpen( tHddHandle hHdd, tDblLinkList *pList )
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
     VOS_STATUS vosStatus;
-    
-    if( !pList) 
+
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return eHAL_STATUS_FAILURE ; 
+        return eHAL_STATUS_FAILURE ;
     }
-    
-    if ( LIST_FLAG_OPEN != pList->Flag ) 
+
+    if ( LIST_FLAG_OPEN != pList->Flag )
     {
         pList->Count = 0;
         pList->cmdTimeoutTimer = NULL;
@@ -278,13 +278,13 @@ eHalStatus csrLLOpen( tHddHandle hHdd, tDblLinkList *pList )
 
 void csrLLClose( tDblLinkList *pList )
 {
-    if( !pList) 
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return ; 
+        return ;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
         // Make sure the list is empty...
         csrLLPurge( pList, LL_ACCESS_LOCK );
@@ -294,23 +294,23 @@ void csrLLClose( tDblLinkList *pList )
 }
 
 void csrLLInsertTail( tDblLinkList *pList, tListElem *pEntry, tANI_BOOLEAN fInterlocked )
-{    
-    if( !pList) 
+{
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return; 
+        return;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
         if(fInterlocked)
-        {  
+        {
             csrLLLock(pList);
         }
         csrListInsertTail( &pList->ListHead, pEntry );
         pList->Count++;
         if(fInterlocked)
-        {  
+        {
             csrLLUnlock(pList);
         }
     }
@@ -320,14 +320,14 @@ void csrLLInsertTail( tDblLinkList *pList, tListElem *pEntry, tANI_BOOLEAN fInte
 
 void csrLLInsertHead( tDblLinkList *pList, tListElem *pEntry, tANI_BOOLEAN fInterlocked )
 {
-    
-    if( !pList) 
+
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return; 
+        return;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
         if(fInterlocked)
         {
@@ -350,14 +350,14 @@ void csrLLInsertHead( tDblLinkList *pList, tListElem *pEntry, tANI_BOOLEAN fInte
 
 
 void csrLLInsertEntry( tDblLinkList *pList, tListElem *pEntry, tListElem *pNewEntry, tANI_BOOLEAN fInterlocked )
-{    
-    if( !pList) 
+{
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return ; 
+        return ;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
         if(fInterlocked)
         {
@@ -378,26 +378,26 @@ tListElem *csrLLRemoveTail( tDblLinkList *pList, tANI_BOOLEAN fInterlocked )
 {
     tListElem *pEntry = NULL;
 
-    if( !pList) 
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return pEntry ; 
+        return pEntry ;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
-        if ( fInterlocked ) 
+        if ( fInterlocked )
         {
             csrLLLock( pList );
         }
 
-        if ( !csrIsListEmpty(&pList->ListHead) ) 
+        if ( !csrIsListEmpty(&pList->ListHead) )
         {
 
             pEntry = csrListRemoveTail( &pList->ListHead );
             pList->Count--;
         }
-        if ( fInterlocked ) 
+        if ( fInterlocked )
         {
             csrLLUnlock( pList );
         }
@@ -411,25 +411,25 @@ tListElem *csrLLPeekTail( tDblLinkList *pList, tANI_BOOLEAN fInterlocked )
 {
     tListElem *pEntry = NULL;
 
-    
-    if( !pList) 
+
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return pEntry ; 
+        return pEntry ;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
-        if ( fInterlocked ) 
-        {  
+        if ( fInterlocked )
+        {
             csrLLLock( pList );
         }
 
-        if ( !csrIsListEmpty(&pList->ListHead) ) 
+        if ( !csrIsListEmpty(&pList->ListHead) )
         {
-            pEntry = pList->ListHead.last; 
+            pEntry = pList->ListHead.last;
         }
-        if ( fInterlocked ) 
+        if ( fInterlocked )
         {
             csrLLUnlock( pList );
         }
@@ -443,28 +443,28 @@ tListElem *csrLLPeekTail( tDblLinkList *pList, tANI_BOOLEAN fInterlocked )
 tListElem *csrLLRemoveHead( tDblLinkList *pList, tANI_BOOLEAN fInterlocked )
 {
     tListElem *pEntry = NULL;
-    
 
-    if( !pList) 
+
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return pEntry ; 
+        return pEntry ;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
-        if ( fInterlocked ) 
-        {  
+        if ( fInterlocked )
+        {
             csrLLLock( pList );
         }
 
-        if ( !csrIsListEmpty(&pList->ListHead) ) 
+        if ( !csrIsListEmpty(&pList->ListHead) )
         {
             pEntry = csrListRemoveHead( &pList->ListHead );
             pList->Count--;
         }
 
-        if ( fInterlocked ) 
+        if ( fInterlocked )
         {
             csrLLUnlock( pList );
         }
@@ -478,24 +478,24 @@ tListElem *csrLLPeekHead( tDblLinkList *pList, tANI_BOOLEAN fInterlocked )
 {
     tListElem *pEntry = NULL;
 
-    if( !pList) 
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return pEntry ; 
+        return pEntry ;
     }
-     
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
-        if ( fInterlocked ) 
-        {  
+        if ( fInterlocked )
+        {
             csrLLLock( pList );
         }
 
-        if ( !csrIsListEmpty(&pList->ListHead) ) 
+        if ( !csrIsListEmpty(&pList->ListHead) )
         {
-            pEntry = pList->ListHead.next; 
+            pEntry = pList->ListHead.next;
         }
-        if ( fInterlocked ) 
+        if ( fInterlocked )
         {
             csrLLUnlock( pList );
         }
@@ -510,25 +510,25 @@ void csrLLPurge( tDblLinkList *pList, tANI_BOOLEAN fInterlocked )
 {
     tListElem *pEntry;
 
-    if( !pList) 
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return ; 
+        return ;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
-        if ( fInterlocked ) 
-        {  
+        if ( fInterlocked )
+        {
             csrLLLock( pList );
         }
-        while( (pEntry = csrLLRemoveHead( pList, LL_ACCESS_NOLOCK )) ) 
+        while( (pEntry = csrLLRemoveHead( pList, LL_ACCESS_NOLOCK )) )
         {
-            // just remove everything from the list until 
+            // just remove everything from the list until
             // nothing left on the list.
         }
-        if ( fInterlocked ) 
-        {  
+        if ( fInterlocked )
+        {
             csrLLUnlock( pList );
         }
     }
@@ -540,15 +540,15 @@ tANI_BOOLEAN csrLLRemoveEntry( tDblLinkList *pList, tListElem *pEntryToRemove, t
     tANI_BOOLEAN fFound = eANI_BOOLEAN_FALSE;
     tListElem *pEntry;
 
-    if( !pList) 
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return fFound; 
+        return fFound;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
-        if ( fInterlocked ) 
+        if ( fInterlocked )
         {
             csrLLLock( pList );
         }
@@ -557,7 +557,7 @@ tANI_BOOLEAN csrLLRemoveEntry( tDblLinkList *pList, tListElem *pEntryToRemove, t
 
         // Have to make sure we don't loop back to the head of the list, which will
         // happen if the entry is NOT on the list...
-        while( pEntry && ( pEntry != &pList->ListHead ) ) 
+        while( pEntry && ( pEntry != &pList->ListHead ) )
         {
             if ( pEntry == pEntryToRemove )
             {
@@ -568,9 +568,9 @@ tANI_BOOLEAN csrLLRemoveEntry( tDblLinkList *pList, tListElem *pEntryToRemove, t
                 break;
             }
 
-            pEntry = pEntry->next; 
+            pEntry = pEntry->next;
         }
-        if ( fInterlocked ) 
+        if ( fInterlocked )
         {
             csrLLUnlock( pList );
         }
@@ -589,30 +589,30 @@ tListElem *csrLLNext( tDblLinkList *pList, tListElem *pEntry, tANI_BOOLEAN fInte
 {
     tListElem *pNextEntry = NULL;
 
-    if( !pList) 
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return pNextEntry ; 
+        return pNextEntry ;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
-        if ( fInterlocked ) 
+        if ( fInterlocked )
         {
             csrLLLock( pList );
         }
 
-        if ( !csrIsListEmpty(&pList->ListHead) && csrLLFindEntry( pList, pEntry ) ) 
+        if ( !csrIsListEmpty(&pList->ListHead) && csrLLFindEntry( pList, pEntry ) )
         {
             pNextEntry = pEntry->next;
             //Make sure we don't walk past the head
-            if ( pNextEntry == &pList->ListHead ) 
+            if ( pNextEntry == &pList->ListHead )
             {
                 pNextEntry = NULL;
             }
         }
 
-        if ( fInterlocked ) 
+        if ( fInterlocked )
         {
             csrLLUnlock( pList );
         }
@@ -626,30 +626,30 @@ tListElem *csrLLPrevious( tDblLinkList *pList, tListElem *pEntry, tANI_BOOLEAN f
 {
     tListElem *pNextEntry = NULL;
 
-    if( !pList) 
+    if( !pList)
     {
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,"%s: Error!! pList is Null", __func__);
-        return pNextEntry ; 
+        return pNextEntry ;
     }
 
-    if ( LIST_FLAG_OPEN == pList->Flag ) 
+    if ( LIST_FLAG_OPEN == pList->Flag )
     {
-        if ( fInterlocked ) 
+        if ( fInterlocked )
         {
             csrLLLock( pList );
         }
 
-        if ( !csrIsListEmpty(&pList->ListHead) && csrLLFindEntry( pList, pEntry ) ) 
+        if ( !csrIsListEmpty(&pList->ListHead) && csrLLFindEntry( pList, pEntry ) )
         {
-            pNextEntry = pEntry->last; 
+            pNextEntry = pEntry->last;
             //Make sure we don't walk past the head
-            if ( pNextEntry == &pList->ListHead ) 
+            if ( pNextEntry == &pList->ListHead )
             {
                 pNextEntry = NULL;
             }
-        }  
+        }
 
-        if ( fInterlocked ) 
+        if ( fInterlocked )
         {
             csrLLUnlock( pList );
         }
@@ -657,7 +657,3 @@ tListElem *csrLLPrevious( tDblLinkList *pList, tListElem *pEntry, tANI_BOOLEAN f
 
     return( pNextEntry );
 }
-
-
-
-
diff --git a/CORE/SME/src/csr/csrLogDump.c b/CORE/SME/src/csr/csrLogDump.c
index 912ed058a311..0a64afd38235 100644
--- a/CORE/SME/src/csr/csrLogDump.c
+++ b/CORE/SME/src/csr/csrLogDump.c
@@ -27,7 +27,7 @@
 
 /*============================================================================
 csrLogDump.c
-Implements the dump commands specific to the csr module. 
+Implements the dump commands specific to the csr module.
 ============================================================================*/
 #include "aniGlobal.h"
 #include "csrApi.h"
@@ -55,7 +55,7 @@ dump_csr( tpAniSirGlobal pMac, tANI_U32 arg1, tANI_U32 arg2, tANI_U32 arg3, tANI
     }
     return p;
 }
-static char *dump_btcSetEvent( tpAniSirGlobal pMac, tANI_U32 arg1, 
+static char *dump_btcSetEvent( tpAniSirGlobal pMac, tANI_U32 arg1,
                                tANI_U32 arg2, tANI_U32 arg3, tANI_U32 arg4, char *p )
 {
     tSmeBtEvent btEvent;
@@ -99,7 +99,7 @@ static char *dump_btcSetEvent( tpAniSirGlobal pMac, tANI_U32 arg1,
     }
     return p;
 }
-static char* dump_csrApConcScanParams( tpAniSirGlobal pMac, tANI_U32 arg1, 
+static char* dump_csrApConcScanParams( tpAniSirGlobal pMac, tANI_U32 arg1,
                                tANI_U32 arg2, tANI_U32 arg3, tANI_U32 arg4, char *p )
 {
     if( arg1 )
@@ -129,7 +129,7 @@ static tDumpFuncEntry csrMenuDumpTable[] = {
 
 void csrDumpInit(tHalHandle hHal)
 {
-    logDumpRegisterTable( (tpAniSirGlobal)hHal, &csrMenuDumpTable[0], 
+    logDumpRegisterTable( (tpAniSirGlobal)hHal, &csrMenuDumpTable[0],
                           sizeof(csrMenuDumpTable)/sizeof(csrMenuDumpTable[0]) );
 }
 
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index 1aaa3b6ac9b8..5c7abaef9025 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -26,12 +26,12 @@
  */
 
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
+
 
-  
     \file csrNeighborRoam.c
-  
+
     Implementation for the simple roaming algorithm for 802.11r Fast transitions and Legacy roaming for Android platform.
 ========================================================================== */
 
@@ -133,7 +133,7 @@ v_U8_t *csrNeighborRoamStateToString(v_U8_t state)
 
     \fn csrNeighborRoamFreeNeighborRoamBSSNode
 
-    \brief  This function frees all the internal pointers CSR NeighborRoam BSS Info 
+    \brief  This function frees all the internal pointers CSR NeighborRoam BSS Info
             and also frees the node itself
 
     \param  pMac - The handle returned by macOpen.
@@ -171,7 +171,7 @@ void csrNeighborRoamFreeNeighborRoamBSSNode(tpAniSirGlobal pMac, tpCsrNeighborRo
     \return TRUE if successfully removed, else FALSE
 
 ---------------------------------------------------------------------------*/
-tANI_BOOLEAN csrNeighborRoamRemoveRoamableAPListEntry(tpAniSirGlobal pMac, 
+tANI_BOOLEAN csrNeighborRoamRemoveRoamableAPListEntry(tpAniSirGlobal pMac,
                                                 tDblLinkList *pList, tpCsrNeighborRoamBSSInfo pNeighborEntry)
 {
     if(pList)
@@ -197,12 +197,12 @@ tANI_BOOLEAN csrNeighborRoamRemoveRoamableAPListEntry(tpAniSirGlobal pMac,
     \return Neighbor Roam BSS Node to be returned
 
 ---------------------------------------------------------------------------*/
-tpCsrNeighborRoamBSSInfo csrNeighborRoamGetRoamableAPListNextEntry(tpAniSirGlobal pMac, 
+tpCsrNeighborRoamBSSInfo csrNeighborRoamGetRoamableAPListNextEntry(tpAniSirGlobal pMac,
                                         tDblLinkList *pList, tpCsrNeighborRoamBSSInfo pNeighborEntry)
 {
     tListElem *pEntry = NULL;
     tpCsrNeighborRoamBSSInfo pResult = NULL;
-    
+
     if(pList)
     {
         if(NULL == pNeighborEntry)
@@ -218,7 +218,7 @@ tpCsrNeighborRoamBSSInfo csrNeighborRoamGetRoamableAPListNextEntry(tpAniSirGloba
             pResult = GET_BASE_ADDR(pEntry, tCsrNeighborRoamBSSInfo, List);
         }
     }
-    
+
     return pResult;
 }
 
@@ -226,7 +226,7 @@ tpCsrNeighborRoamBSSInfo csrNeighborRoamGetRoamableAPListNextEntry(tpAniSirGloba
 
     \fn csrNeighborRoamFreeRoamableBSSList
 
-    \brief   Empties and frees all the nodes in the roamable AP list 
+    \brief   Empties and frees all the nodes in the roamable AP list
 
     \param  pMac - The handle returned by macOpen.
             pList - Neighbor Roam BSS List to be emptied
@@ -249,7 +249,7 @@ void csrNeighborRoamFreeRoamableBSSList(tpAniSirGlobal pMac, tDblLinkList *pList
     return;
 }
 
-static void csrNeighborRoamTriggerHandoff(tpAniSirGlobal pMac, 
+static void csrNeighborRoamTriggerHandoff(tpAniSirGlobal pMac,
                                           tpCsrNeighborRoamControlInfo pNeighborRoamInfo)
 {
 #ifdef WLAN_FEATURE_VOWIFI_11R
@@ -634,14 +634,14 @@ csrNeighborRoamSetRoamRescanRssiDiff(tpAniSirGlobal pMac,
     \return VOID
 
 ---------------------------------------------------------------------------*/
-VOS_STATUS csrNeighborRoamReassocIndCallback(v_PVOID_t pAdapter, 
-                               v_U8_t trafficStatus, 
+VOS_STATUS csrNeighborRoamReassocIndCallback(v_PVOID_t pAdapter,
+                               v_U8_t trafficStatus,
                                v_PVOID_t pUserCtxt,
                                v_S7_t   avgRssi)
 {
     tpAniSirGlobal pMac = PMAC_STRUCT( pUserCtxt );
     tpCsrNeighborRoamControlInfo    pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
-    VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;   
+    VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
 
     if (eSME_ROAM_TRIGGER_FAST_ROAM != pNeighborRoamInfo->cfgRoamEn)
     {
@@ -650,10 +650,10 @@ VOS_STATUS csrNeighborRoamReassocIndCallback(v_PVOID_t pAdapter,
                          avgRssi);
 
         vosStatus = WLANTL_DeregRSSIIndicationCB(pMac->roam.gVosContext, (v_S7_t)pNeighborRoamInfo->cfgParams.neighborReassocThreshold * (-1),
-                                                        WLANTL_HO_THRESHOLD_DOWN, 
+                                                        WLANTL_HO_THRESHOLD_DOWN,
                                                         csrNeighborRoamReassocIndCallback,
                                                         VOS_MODULE_ID_SME);
-                        
+
         if(!VOS_IS_STATUS_SUCCESS(vosStatus))
         {
             //err msg
@@ -698,7 +698,7 @@ static void csrNeighborRoamResetChannelInfo(tpCsrNeighborRoamChannelInfo rChInfo
                 rChInfo->currentChannelListInfo.ChannelList = NULL;
                 rChInfo->chanListScanInProgress = eANI_BOOLEAN_FALSE;
         }
-        else 
+        else
         {
                 rChInfo->currentChanIndex = 0;
                 rChInfo->chanListScanInProgress = eANI_BOOLEAN_TRUE;
@@ -761,13 +761,13 @@ static void csrNeighborRoamDeregAllRssiIndication(tpAniSirGlobal pMac)
         VOS_STATUS                    vosStatus = VOS_STATUS_SUCCESS;
 
         NEIGHBOR_ROAM_DEBUG(pMac, LOG2,
-                        FL("Deregister neighbor lookup UP callback with TL. RSSI = %d"), 
+                        FL("Deregister neighbor lookup UP callback with TL. RSSI = %d"),
                         NEIGHBOR_ROAM_LOOKUP_UP_THRESHOLD * (-1));
 
         /* Deregister reassoc callback. Ignore return status */
-        vosStatus = WLANTL_DeregRSSIIndicationCB(pMac->roam.gVosContext, 
+        vosStatus = WLANTL_DeregRSSIIndicationCB(pMac->roam.gVosContext,
                         (v_S7_t)NEIGHBOR_ROAM_LOOKUP_UP_THRESHOLD * (-1),
-                        WLANTL_HO_THRESHOLD_UP, 
+                        WLANTL_HO_THRESHOLD_UP,
                         csrNeighborRoamNeighborLookupUPCallback,
                         VOS_MODULE_ID_SME);
 
@@ -779,13 +779,13 @@ static void csrNeighborRoamDeregAllRssiIndication(tpAniSirGlobal pMac)
         }
 
         NEIGHBOR_ROAM_DEBUG(pMac, LOG2,
-                        FL("Deregistering reassoc DOWN callback with TL. RSSI = %d"), 
+                        FL("Deregistering reassoc DOWN callback with TL. RSSI = %d"),
                         pNeighborRoamInfo->cfgParams.neighborReassocThreshold * (-1));
 
         /* Deregister reassoc callback. Ignore return status */
-        vosStatus = WLANTL_DeregRSSIIndicationCB(pMac->roam.gVosContext, 
+        vosStatus = WLANTL_DeregRSSIIndicationCB(pMac->roam.gVosContext,
                         (v_S7_t)pNeighborRoamInfo->cfgParams.neighborReassocThreshold * (-1),
-                        WLANTL_HO_THRESHOLD_DOWN, 
+                        WLANTL_HO_THRESHOLD_DOWN,
                         csrNeighborRoamReassocIndCallback,
                         VOS_MODULE_ID_SME);
 
@@ -797,13 +797,13 @@ static void csrNeighborRoamDeregAllRssiIndication(tpAniSirGlobal pMac)
         }
 
         NEIGHBOR_ROAM_DEBUG(pMac, LOG2,
-                        FL("Deregistering neighborLookup DOWN callback with TL. RSSI = %d"), 
+                        FL("Deregistering neighborLookup DOWN callback with TL. RSSI = %d"),
                         pNeighborRoamInfo->currentNeighborLookupThreshold * (-1));
 
         /* Deregister neighbor lookup callback. Ignore return status */
-        vosStatus = WLANTL_DeregRSSIIndicationCB(pMac->roam.gVosContext, 
+        vosStatus = WLANTL_DeregRSSIIndicationCB(pMac->roam.gVosContext,
                         (v_S7_t)pNeighborRoamInfo->currentNeighborLookupThreshold * (-1),
-                        WLANTL_HO_THRESHOLD_DOWN, 
+                        WLANTL_HO_THRESHOLD_DOWN,
                         csrNeighborRoamNeighborLookupDOWNCallback,
                         VOS_MODULE_ID_SME);
 
@@ -815,7 +815,7 @@ static void csrNeighborRoamDeregAllRssiIndication(tpAniSirGlobal pMac)
         }
 
         /* Reset thresholds only after deregistering DOWN event from TL */
-        pNeighborRoamInfo->currentNeighborLookupThreshold = 
+        pNeighborRoamInfo->currentNeighborLookupThreshold =
                 pNeighborRoamInfo->cfgParams.neighborLookupThreshold;
         pNeighborRoamInfo->currentOpportunisticThresholdDiff =
                 pNeighborRoamInfo->cfgParams.nOpportunisticThresholdDiff;
@@ -832,8 +832,8 @@ static void csrNeighborRoamDeregAllRssiIndication(tpAniSirGlobal pMac)
 
     \fn csrNeighborRoamResetConnectedStateControlInfo
 
-    \brief  This function will reset the neighbor roam control info data structures. 
-            This function should be invoked whenever we move to CONNECTED state from 
+    \brief  This function will reset the neighbor roam control info data structures.
+            This function should be invoked whenever we move to CONNECTED state from
             any state other than INIT state
 
     \param  pMac - The handle returned by macOpen.
@@ -847,7 +847,7 @@ void csrNeighborRoamResetConnectedStateControlInfo(tpAniSirGlobal pMac)
 
     csrNeighborRoamResetChannelInfo(&pNeighborRoamInfo->roamChannelInfo);
     csrNeighborRoamFreeRoamableBSSList(pMac, &pNeighborRoamInfo->roamableAPList);
-    
+
  /* We dont need to run this timer any more. */
     vos_timer_stop(&pNeighborRoamInfo->neighborResultsRefreshTimer);
     vos_timer_stop(&pNeighborRoamInfo->emptyScanRefreshTimer);
@@ -885,7 +885,7 @@ void csrNeighborRoamResetReportScanStateControlInfo(tpAniSirGlobal pMac)
     /* Stop empty scan results refresh timer */
     vos_timer_stop(&pNeighborRoamInfo->emptyScanRefreshTimer);
      /* Purge roamable AP list */
-       csrNeighborRoamFreeRoamableBSSList(pMac, &pNeighborRoamInfo->roamableAPList); 
+       csrNeighborRoamFreeRoamableBSSList(pMac, &pNeighborRoamInfo->roamableAPList);
     return;
 }
 
@@ -893,8 +893,8 @@ void csrNeighborRoamResetReportScanStateControlInfo(tpAniSirGlobal pMac)
 
     \fn csrNeighborRoamResetInitStateControlInfo
 
-    \brief  This function will reset the neighbor roam control info data structures. 
-            This function should be invoked whenever we move to CONNECTED state from 
+    \brief  This function will reset the neighbor roam control info data structures.
+            This function should be invoked whenever we move to CONNECTED state from
             INIT state
 
     \param  pMac - The handle returned by macOpen.
@@ -917,16 +917,16 @@ void csrNeighborRoamResetInitStateControlInfo(tpAniSirGlobal pMac)
 
     \fn csrNeighborRoamBssIdScanFilter
 
-    \brief  This API is used to prepare a filter to obtain scan results when 
-            we complete the scan in the REPORT_SCAN state after receiving a 
-            valid neighbor report from AP. This filter includes BSSIDs received from 
-            the neighbor report from the AP in addition to the other filter parameters 
+    \brief  This API is used to prepare a filter to obtain scan results when
+            we complete the scan in the REPORT_SCAN state after receiving a
+            valid neighbor report from AP. This filter includes BSSIDs received from
+            the neighbor report from the AP in addition to the other filter parameters
             created from connected profile
 
     \param  pMac - The handle returned by macOpen.
             pScanFilter - Scan filter to be filled and returned
 
-    \return eHAL_STATUS_SUCCESS on succesful filter creation, corresponding error 
+    \return eHAL_STATUS_SUCCESS on succesful filter creation, corresponding error
             code otherwise
 
 ---------------------------------------------------------------------------*/
@@ -953,7 +953,7 @@ static eHalStatus csrNeighborRoamBssIdScanFilter(tpAniSirGlobal pMac, tCsrScanRe
     /* Populate the BSSID from Neighbor BSS info received from neighbor report */
     for (i = 0; i < pScanFilter->BSSIDs.numOfBSSIDs; i++)
     {
-        vos_mem_copy(&pScanFilter->BSSIDs.bssid[i], 
+        vos_mem_copy(&pScanFilter->BSSIDs.bssid[i],
                 pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo[i].neighborBssId, sizeof(tSirMacAddr));
     }
 
@@ -1017,7 +1017,7 @@ eHalStatus csrNeighborRoamAddBssIdToPreauthFailList(tpAniSirGlobal pMac, tSirMac
                  bssId,
                  sizeof(tSirMacAddr));
     pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress++;
-    
+
     return eHAL_STATUS_SUCCESS;
 }
 
@@ -1025,7 +1025,7 @@ eHalStatus csrNeighborRoamAddBssIdToPreauthFailList(tpAniSirGlobal pMac, tSirMac
 
     \fn csrNeighborRoamIsPreauthCandidate
 
-    \brief  This function checks whether the given MAC address is already 
+    \brief  This function checks whether the given MAC address is already
             present in the preauth fail list and returns TRUE/FALSE accordingly
 
     \param  pMac - The handle returned by macOpen.
@@ -1046,7 +1046,7 @@ tANI_BOOLEAN csrNeighborRoamIsPreauthCandidate(tpAniSirGlobal pMac, tSirMacAddr
 #endif
     if (0 == pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress)
         return eANI_BOOLEAN_TRUE;
-    
+
     for (i = 0; i < pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress; i++)
     {
         if (VOS_TRUE == vos_mem_compare(pNeighborRoamInfo->FTRoamInfo.preAuthFailList.macAddress[i],
@@ -1065,7 +1065,7 @@ tANI_BOOLEAN csrNeighborRoamIsPreauthCandidate(tpAniSirGlobal pMac, tSirMacAddr
 
     \fn csrNeighborRoamIssuePreauthReq
 
-    \brief  This function issues preauth request to PE with the 1st AP entry in the 
+    \brief  This function issues preauth request to PE with the 1st AP entry in the
             roamable AP list
 
     \param  pMac - The handle returned by macOpen.
@@ -1082,7 +1082,7 @@ static eHalStatus csrNeighborRoamIssuePreauthReq(tpAniSirGlobal pMac)
 #ifdef FEATURE_WLAN_LFR_METRICS
     tCsrRoamInfo *roamInfo;
 #endif
-    
+
     if (eANI_BOOLEAN_FALSE != pNeighborRoamInfo->FTRoamInfo.preauthRspPending)
     {
        /* This must not be true here */
@@ -1135,15 +1135,15 @@ static eHalStatus csrNeighborRoamIssuePreauthReq(tpAniSirGlobal pMac)
             return status;
         }
     }
-    
+
     pNeighborRoamInfo->FTRoamInfo.preauthRspPending = eANI_BOOLEAN_TRUE;
 
     /* Increment the preauth retry count */
     pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries++;
-    
+
     /* Transition the state to preauthenticating */
     CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING)
-    
+
     return status;
 }
 
@@ -1152,10 +1152,10 @@ static eHalStatus csrNeighborRoamIssuePreauthReq(tpAniSirGlobal pMac)
     \fn csrNeighborRoamPreauthRspHandler
 
     \brief  This function handle the Preauth response from PE
-            Every preauth is allowed max 3 tries if it fails. If a bssid failed 
-            for more than MAX_TRIES, we will remove it from the list and try 
-            with the next node in the roamable AP list and add the BSSID to pre-auth failed 
-            list. If no more entries present in 
+            Every preauth is allowed max 3 tries if it fails. If a bssid failed
+            for more than MAX_TRIES, we will remove it from the list and try
+            with the next node in the roamable AP list and add the BSSID to pre-auth failed
+            list. If no more entries present in
             roamable AP list, transition to REPORT_SCAN state
 
     \param  pMac - The handle returned by macOpen.
@@ -1180,7 +1180,7 @@ eHalStatus csrNeighborRoamPreauthRspHandler(tpAniSirGlobal pMac, tSirRetStatus l
 
     if (eANI_BOOLEAN_FALSE == pNeighborRoamInfo->FTRoamInfo.preauthRspPending)
     {
-            
+
             /* This can happen when we disconnect immediately
              * after sending a pre-auth request. During processing
              * of the disconnect command, we would have reset
@@ -1191,7 +1191,7 @@ eHalStatus csrNeighborRoamPreauthRspHandler(tpAniSirGlobal pMac, tSirRetStatus l
                                 pNeighborRoamInfo->neighborRoamState);
             preauthProcessed = eHAL_STATUS_FAILURE;
             goto DEQ_PREAUTH;
-    }    
+    }
 
     // We can receive it in these 2 states.
     if ((pNeighborRoamInfo->neighborRoamState != eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING) &&
@@ -1244,7 +1244,7 @@ eHalStatus csrNeighborRoamPreauthRspHandler(tpAniSirGlobal pMac, tSirRetStatus l
         CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE)
         pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries = 0;
 
-        /* The caller of this function would start a timer and by the time it expires, supplicant should 
+        /* The caller of this function would start a timer and by the time it expires, supplicant should
            have provided the updated FTIEs to SME. So, when it expires, handoff will be triggered then */
     }
     else
@@ -1254,7 +1254,7 @@ eHalStatus csrNeighborRoamPreauthRspHandler(tpAniSirGlobal pMac, tSirRetStatus l
 
         smsLog(pMac, LOGE, FL("Preauth failed retry number %d, status = 0x%x"),
                pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries, limStatus);
-        
+
         /* Preauth failed. Add the bssId to the preAuth failed list MAC Address. Also remove the AP from roamable AP list */
         if ((pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries >=
              CSR_NEIGHBOR_ROAM_MAX_NUM_PREAUTH_RETRIES) ||
@@ -1302,7 +1302,7 @@ eHalStatus csrNeighborRoamPreauthRspHandler(tpAniSirGlobal pMac, tSirRetStatus l
 
         /* Issue preauth request for the same/next entry */
         if (eHAL_STATUS_SUCCESS == csrNeighborRoamIssuePreauthReq(pMac))
-        goto DEQ_PREAUTH; 
+        goto DEQ_PREAUTH;
 
 #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
         if (csrRoamIsRoamOffloadScanEnabled(pMac))
@@ -1374,7 +1374,7 @@ eHalStatus csrNeighborRoamPrepareScanProfileFilter(tpAniSirGlobal pMac, tCsrScan
     tANI_U8 sessionId   = (tANI_U8)pNeighborRoamInfo->csrSessionId;
     tCsrRoamConnectedProfile *pCurProfile = &pMac->roam.roamSession[sessionId].connectedProfile;
     tANI_U8 i = 0;
-    
+
     VOS_ASSERT(pScanFilter != NULL);
     if (pScanFilter == NULL)
         return eHAL_STATUS_FAILURE;
@@ -1407,7 +1407,7 @@ eHalStatus csrNeighborRoamPrepareScanProfileFilter(tpAniSirGlobal pMac, tCsrScan
     }
 #endif
     /* Populate all the information from the connected profile */
-    pScanFilter->SSIDs.numOfSSIDs = 1;  
+    pScanFilter->SSIDs.numOfSSIDs = 1;
     pScanFilter->SSIDs.SSIDList = vos_mem_malloc(sizeof(tCsrSSIDInfo));
     if (NULL == pScanFilter->SSIDs.SSIDList)
     {
@@ -1417,7 +1417,7 @@ eHalStatus csrNeighborRoamPrepareScanProfileFilter(tpAniSirGlobal pMac, tCsrScan
     pScanFilter->SSIDs.SSIDList->handoffPermitted = 1;
     pScanFilter->SSIDs.SSIDList->ssidHidden = 0;
     pScanFilter->SSIDs.SSIDList->SSID.length =  pCurProfile->SSID.length;
-    vos_mem_copy((void *)pScanFilter->SSIDs.SSIDList->SSID.ssId, (void *)pCurProfile->SSID.ssId, pCurProfile->SSID.length); 
+    vos_mem_copy((void *)pScanFilter->SSIDs.SSIDList->SSID.ssId, (void *)pCurProfile->SSID.ssId, pCurProfile->SSID.length);
 
     NEIGHBOR_ROAM_DEBUG(pMac, LOG1, FL("Filtering for SSID %.*s from scan results,"
                                 "length of SSID = %u"),
@@ -1502,7 +1502,7 @@ tANI_U32 csrGetCurrentAPRssi(tpAniSirGlobal pMac, tScanResultHandle *pScanResult
 
     \fn csrNeighborRoamProcessScanResults
 
-    \brief  This function extracts scan results, sorts on the basis of neighbor score(todo). 
+    \brief  This function extracts scan results, sorts on the basis of neighbor score(todo).
             Assumed that the results are already sorted by RSSI by csrScanGetResult
 
     \param  pMac - The handle returned by macOpen.
@@ -1513,7 +1513,7 @@ tANI_U32 csrGetCurrentAPRssi(tpAniSirGlobal pMac, tScanResultHandle *pScanResult
 
 ---------------------------------------------------------------------------*/
 
-static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac, 
+static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac,
                                                       tScanResultHandle *pScanResultList)
 {
     tCsrScanResultInfo *pScanResult;
@@ -1538,7 +1538,7 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac,
     /* Based on the previous state we need to check whether the list should be sorted again taking neighbor score into consideration */
     /* If previous state is CFG_CHAN_LIST_SCAN, there should not be any neighbor score associated with any of the BSS.
        If the previous state is REPORT_QUERY, then there will be neighbor score for each of the APs */
-    /* For now, let us take the top of the list provided as it is by the CSR Scan result API. This means it is assumed that neighbor score 
+    /* For now, let us take the top of the list provided as it is by the CSR Scan result API. This means it is assumed that neighbor score
        and rssi score are in the same order. This will be taken care later */
 
     while (NULL != (pScanResult = csrScanResultGetNext(pMac, *pScanResultList)))
@@ -1687,8 +1687,8 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac,
 #endif /* FEATURE_WLAN_CCX */
 
 #ifdef FEATURE_WLAN_LFR
-        // If we are supporting legacy roaming, and 
-        // if the candidate is on the "pre-auth failed" list, ignore it. 
+        // If we are supporting legacy roaming, and
+        // if the candidate is on the "pre-auth failed" list, ignore it.
         if (csrRoamIsFastRoamEnabled(pMac, CSR_SESSION_ID_INVALID))
         {
             if (!csrNeighborRoamIsPreauthCandidate(pMac, pScanResult->BssDescriptor.bssId))
@@ -1699,7 +1699,7 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac,
         }
 #endif /* FEATURE_WLAN_LFR */
 
-        /* If the received timestamp in BSS description is earlier than the scan request timestamp, skip 
+        /* If the received timestamp in BSS description is earlier than the scan request timestamp, skip
          * this result */
         if ((pNeighborRoamInfo->scanRequestTimeStamp >= pScanResult->BssDescriptor.nReceivedTime)
 #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
@@ -1721,7 +1721,7 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac,
         pBssInfo->pBssDescription = vos_mem_malloc(pScanResult->BssDescriptor.length + sizeof(pScanResult->BssDescriptor.length));
         if (pBssInfo->pBssDescription != NULL)
         {
-            vos_mem_copy(pBssInfo->pBssDescription, &pScanResult->BssDescriptor, 
+            vos_mem_copy(pBssInfo->pBssDescription, &pScanResult->BssDescriptor,
                     pScanResult->BssDescriptor.length + sizeof(pScanResult->BssDescriptor.length));
         }
         else
@@ -1729,7 +1729,7 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac,
             smsLog(pMac, LOGE, FL("Memory allocation for Neighbor Roam BSS Descriptor failed.. Just ignoring"));
             vos_mem_free(pBssInfo);
             continue;
-            
+
         }
         pBssInfo->apPreferenceVal = 10; //some value for now. Need to calculate the actual score based on RSSI and neighbor AP score
 
@@ -1775,8 +1775,8 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac,
 
     \fn csrNeighborRoamHandleEmptyScanResult
 
-    \brief      This function will be invoked in CFG_CHAN_LIST_SCAN state when 
-                there are no valid APs in the scan result for roaming. This means 
+    \brief      This function will be invoked in CFG_CHAN_LIST_SCAN state when
+                there are no valid APs in the scan result for roaming. This means
                 our AP is the best and no other AP is around. No point in scanning
                 again and again. Performing the following here.
                 1. Stop the neighbor scan timer.
@@ -1889,10 +1889,10 @@ static VOS_STATUS csrNeighborRoamHandleEmptyScanResult(tpAniSirGlobal pMac)
 
     /* Transition to CONNECTED state */
     CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_CONNECTED);
-        
+
     /* Reset all the necessary variables before transitioning to the CONNECTED state */
     csrNeighborRoamResetConnectedStateControlInfo(pMac);
-        
+
 #ifdef FEATURE_WLAN_LFR
     if (pNeighborRoamInfo->uEmptyScanCount == eFirstEmptyScan)
     {
@@ -2000,7 +2000,7 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac)
     eHalStatus              hstatus;
 
 #if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
-        /* If the state is REPORT_SCAN, then this must be the scan after the REPORT_QUERY state. So, we 
+        /* If the state is REPORT_SCAN, then this must be the scan after the REPORT_QUERY state. So, we
            should use the BSSID filter made out of neighbor reports */
         if ((eCSR_NEIGHBOR_ROAM_STATE_REPORT_SCAN == pNeighborRoamInfo->neighborRoamState)
 #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
@@ -2054,7 +2054,7 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac)
                     pNeighborRoamInfo->uScanMode = DEFAULT_SCAN;
 #endif
 #ifdef WLAN_FEATURE_VOWIFI_11R
-                    /* If this is a non-11r association, then we can register the reassoc callback here as we have some 
+                    /* If this is a non-11r association, then we can register the reassoc callback here as we have some
                                         APs in the roamable AP list */
                     if (pNeighborRoamInfo->is11rAssoc)
                     {
@@ -2064,7 +2064,7 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac)
                     else
 #endif
 #ifdef FEATURE_WLAN_CCX
-                    /* If this is a non-11r association, then we can register the reassoc callback here as we have some 
+                    /* If this is a non-11r association, then we can register the reassoc callback here as we have some
                                         APs in the roamable AP list */
                     if (pNeighborRoamInfo->isCCXAssoc)
                     {
@@ -2074,7 +2074,7 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac)
                     else
 #endif
 #ifdef FEATURE_WLAN_LFR
-                    /* If LFR is enabled, then we can register the reassoc callback here as we have some 
+                    /* If LFR is enabled, then we can register the reassoc callback here as we have some
                                         APs in the roamable AP list */
                     if (csrRoamIsFastRoamEnabled(pMac, CSR_SESSION_ID_INVALID))
                     {
@@ -2084,13 +2084,13 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac)
                     else
 #endif
                     {
-                       
+
                         NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Completed scanning of CFG CHAN LIST in non-11r association. Registering reassoc callback"));
                         /* Nothing much to do now. Will continue to remain in this state in case of non-11r association */
-                        /* Stop the timer. But how long the roamable AP list will be valid in here. At some point of time, we 
-                           need to restart the CFG CHAN list scan procedure if reassoc callback is not invoked from TL 
+                        /* Stop the timer. But how long the roamable AP list will be valid in here. At some point of time, we
+                           need to restart the CFG CHAN list scan procedure if reassoc callback is not invoked from TL
                            within certain duration */
-                        
+
 //                        vos_timer_stop(&pNeighborRoamInfo->neighborScanTimer);
                     }
                 }
@@ -2101,7 +2101,7 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac)
                     csrNeighborRoamHandleEmptyScanResult(pMac);
                 }
                 break;
-#ifdef WLAN_FEATURE_VOWIFI_11R                
+#ifdef WLAN_FEATURE_VOWIFI_11R
             case eCSR_NEIGHBOR_ROAM_STATE_REPORT_SCAN:
                 if (!tempVal)
                 {
@@ -2115,7 +2115,7 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac)
                 // Can come only in INIT state. Where in we are associated, we sent scan and user
                 // in the meantime decides to disassoc, we will be in init state and still received call
                 // back issued. Should not come here in any other state, printing just in case
-                VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+                VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                         "%s: [INFOLOG] State %d", __func__, (pNeighborRoamInfo->neighborRoamState));
 
                 // Lets just exit out silently.
@@ -2161,7 +2161,7 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac)
         hstatus = vos_timer_start(&pNeighborRoamInfo->neighborResultsRefreshTimer,
                     pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod);
 
-           /* This timer should be started before registering the Reassoc callback with TL. This is because, it is very likely 
+           /* This timer should be started before registering the Reassoc callback with TL. This is because, it is very likely
             * that the callback getting called immediately and the timer would never be stopped when pre-auth is in progress */
         if( hstatus != eHAL_STATUS_SUCCESS)
             {
@@ -2175,16 +2175,16 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac)
             NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Registering DOWN event Reassoc callback with TL. RSSI = %d"), pNeighborRoamInfo->cfgParams.neighborReassocThreshold * (-1));
             /* Register a reassoc Indication callback */
             vosStatus = WLANTL_RegRSSIIndicationCB(pMac->roam.gVosContext, (v_S7_t)pNeighborRoamInfo->cfgParams.neighborReassocThreshold * (-1),
-                                            WLANTL_HO_THRESHOLD_DOWN, 
+                                            WLANTL_HO_THRESHOLD_DOWN,
                                             csrNeighborRoamReassocIndCallback,
                                             VOS_MODULE_ID_SME, pMac);
-            
+
             if(!VOS_IS_STATUS_SUCCESS(vosStatus))
             {
                //err msg
                smsLog(pMac, LOGW, FL(" Couldn't register csrNeighborRoamReassocIndCallback with TL: Status = %d"), vosStatus);
             }
- 
+
         }
 
 #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
@@ -2216,11 +2216,11 @@ if (csrRoamIsRoamOffloadScanEnabled(pMac))
 
     \fn csrNeighborRoamScanRequestCallback
 
-    \brief  This function is the callback function registered in csrScanRequest() to 
-            indicate the completion of scan. If scan is completed for all the channels in 
+    \brief  This function is the callback function registered in csrScanRequest() to
+            indicate the completion of scan. If scan is completed for all the channels in
             the channel list, this function gets the scan result and starts the refresh results
             timer to avoid having stale results. If scan is not completed on all the channels,
-            it restarts the neighbor scan timer which on expiry issues scan on the next 
+            it restarts the neighbor scan timer which on expiry issues scan on the next
             channel
 
     \param  halHandle - The handle returned by macOpen.
@@ -2262,7 +2262,7 @@ static eHalStatus csrNeighborRoamScanRequestCallback(tHalHandle halHandle, void
     }
 #endif
     pMac->roam.neighborRoamInfo.scanRspPending = eANI_BOOLEAN_FALSE;
-    
+
     /* This can happen when we receive a UP event from TL in any of the scan states. Silently ignore it */
     if (eCSR_NEIGHBOR_ROAM_STATE_CONNECTED == pNeighborRoamInfo->neighborRoamState)
     {
@@ -2442,7 +2442,7 @@ static eHalStatus csrNeighborRoamContiguousScanRequestCallback(tHalHandle halHan
 
     \fn csrNeighborRoamIssueBgScanRequest
 
-    \brief  This function issues CSR scan request after populating all the BG scan params 
+    \brief  This function issues CSR scan request after populating all the BG scan params
             passed
 
     \param  pMac - The handle returned by macOpen.
@@ -2451,7 +2451,7 @@ static eHalStatus csrNeighborRoamContiguousScanRequestCallback(tHalHandle halHan
     \return eHAL_STATUS_SUCCESS on success, corresponding error code otherwise
 
 ---------------------------------------------------------------------------*/
-eHalStatus csrNeighborRoamIssueBgScanRequest(tpAniSirGlobal pMac, 
+eHalStatus csrNeighborRoamIssueBgScanRequest(tpAniSirGlobal pMac,
                                              tCsrBGScanRequest *pBgScanParams,
                                              tANI_U32 sessionId,
                                              csrScanCompleteCallback callbackfn)
@@ -2461,10 +2461,10 @@ eHalStatus csrNeighborRoamIssueBgScanRequest(tpAniSirGlobal pMac,
     tCsrScanRequest scanReq;
     tANI_U8 channel;
     void * userData = NULL;
-    
+
     if (1 == pBgScanParams->ChannelInfo.numOfChannels)
         NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("Channel = %d, ChanIndex = %d"),
-            pBgScanParams->ChannelInfo.ChannelList[0], 
+            pBgScanParams->ChannelInfo.ChannelList[0],
             pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex);
 
     //send down the scan req for 1 channel on the associated SSID
@@ -2483,12 +2483,12 @@ eHalStatus csrNeighborRoamIssueBgScanRequest(tpAniSirGlobal pMac,
     scanReq.SSIDs.SSIDList[0].handoffPermitted = eANI_BOOLEAN_TRUE;
     scanReq.SSIDs.SSIDList[0].ssidHidden = eANI_BOOLEAN_TRUE;
     vos_mem_copy((void *)&scanReq.SSIDs.SSIDList[0].SSID, (void *)&pBgScanParams->SSID, sizeof(pBgScanParams->SSID));
-    
+
     scanReq.ChannelInfo.numOfChannels = pBgScanParams->ChannelInfo.numOfChannels;
     if (1 == pBgScanParams->ChannelInfo.numOfChannels)
     {
         channel = pBgScanParams->ChannelInfo.ChannelList[0];
-        scanReq.ChannelInfo.ChannelList = &channel;    
+        scanReq.ChannelInfo.ChannelList = &channel;
     }
     else
     {
@@ -2523,13 +2523,13 @@ eHalStatus csrNeighborRoamIssueBgScanRequest(tpAniSirGlobal pMac,
     vos_mem_free(scanReq.SSIDs.SSIDList);
     if (1 == pBgScanParams->ChannelInfo.numOfChannels)
         NEIGHBOR_ROAM_DEBUG(pMac, LOG1, FL("Channel List Address = %p, Actual index = %d"),
-                &pMac->roam.neighborRoamInfo.roamChannelInfo.currentChannelListInfo.ChannelList[0], 
+                &pMac->roam.neighborRoamInfo.roamChannelInfo.currentChannelListInfo.ChannelList[0],
                 pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex);
 
     return status;
 }
 
-static void csrNeighborRoamFillNonChannelBgScanParams (tpAniSirGlobal pMac, 
+static void csrNeighborRoamFillNonChannelBgScanParams (tpAniSirGlobal pMac,
                                                        tpCsrBGScanRequest bgScanParams)
 {
     tpCsrNeighborRoamControlInfo    pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
@@ -2537,7 +2537,7 @@ static void csrNeighborRoamFillNonChannelBgScanParams (tpAniSirGlobal pMac,
 
     vos_mem_copy(bgScanParams->bssid, broadcastBssid, sizeof(tCsrBssid));
     bgScanParams->SSID.length = pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.length;
-    vos_mem_copy(bgScanParams->SSID.ssId, 
+    vos_mem_copy(bgScanParams->SSID.ssId,
         pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.ssId,
         pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.length);
 
@@ -2549,9 +2549,9 @@ static void csrNeighborRoamFillNonChannelBgScanParams (tpAniSirGlobal pMac,
 
     \fn csrNeighborRoamPerformBgScan
 
-    \brief  This function is invoked on every expiry of neighborScanTimer till all 
-            the channels in the channel list are scanned. It populates necessary 
-            parameters for BG scan and calls appropriate AP to invoke the CSR scan 
+    \brief  This function is invoked on every expiry of neighborScanTimer till all
+            the channels in the channel list are scanned. It populates necessary
+            parameters for BG scan and calls appropriate AP to invoke the CSR scan
             request
 
     \param  pMac - The handle returned by macOpen.
@@ -2570,12 +2570,12 @@ eHalStatus csrNeighborRoamPerformBgScan(tpAniSirGlobal pMac, tANI_U32 sessionId)
     {
         NEIGHBOR_ROAM_DEBUG(pMac, LOG1, FL("Channel List Address = %p"), &pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList[0]);
     }
-    else 
+    else
     {
         NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Channel List Empty"));
         // Go back and restart. Mostly timer start failure has occurred.
         // When timer start is declared a failure, then we delete the list.
-        // Should not happen now as we stop and then only start the scan timer. 
+        // Should not happen now as we stop and then only start the scan timer.
         // still handle the unlikely case.
         csrNeighborRoamHandleEmptyScanResult(pMac);
         return status;
@@ -2598,7 +2598,7 @@ eHalStatus csrNeighborRoamPerformBgScan(tpAniSirGlobal pMac, tANI_U32 sessionId)
     channel = pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList[pNeighborRoamInfo->roamChannelInfo.currentChanIndex];
     bgScanParams.ChannelInfo.numOfChannels = 1;
     bgScanParams.ChannelInfo.ChannelList = &channel;
-   
+
     csrNeighborRoamFillNonChannelBgScanParams(pMac, &bgScanParams);
 
     status = csrNeighborRoamIssueBgScanRequest(pMac, &bgScanParams,
@@ -2609,15 +2609,15 @@ eHalStatus csrNeighborRoamPerformBgScan(tpAniSirGlobal pMac, tANI_U32 sessionId)
     }
 
     pNeighborRoamInfo->roamChannelInfo.currentChanIndex++;
-    if (pNeighborRoamInfo->roamChannelInfo.currentChanIndex >= 
+    if (pNeighborRoamInfo->roamChannelInfo.currentChanIndex >=
             pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels)
-    {      
+    {
         NEIGHBOR_ROAM_DEBUG(pMac, LOG1, FL("Completed scanning channels in Channel List: CurrChanIndex = %d, Num Channels = %d"),
-                                            pNeighborRoamInfo->roamChannelInfo.currentChanIndex, 
+                                            pNeighborRoamInfo->roamChannelInfo.currentChanIndex,
                                             pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels);
         /* We have completed scanning all the channels */
         pNeighborRoamInfo->roamChannelInfo.currentChanIndex = 0;
-        /* We are no longer scanning the channel list. Next timer firing should be used to get the scan results 
+        /* We are no longer scanning the channel list. Next timer firing should be used to get the scan results
            and select the best AP in the list */
         if (eANI_BOOLEAN_TRUE == pNeighborRoamInfo->roamChannelInfo.chanListScanInProgress)
         {
@@ -2710,7 +2710,7 @@ eHalStatus csrNeighborRoamPerformContiguousBgScan(tpAniSirGlobal pMac, tANI_U32
 
     \fn csrNeighborRoamNeighborScanTimerCallback
 
-    \brief  This function is the neighbor scan timer callback function. It invokes 
+    \brief  This function is the neighbor scan timer callback function. It invokes
             the BG scan request based on the current and previous states
 
     \param  pv - CSR timer context info which includes pMac and session ID
@@ -2755,7 +2755,7 @@ void csrNeighborRoamNeighborScanTimerCallback(void *pv)
             }
             break;
 #endif /* WLAN_FEATURE_VOWIFI_11R */
-        case eCSR_NEIGHBOR_ROAM_STATE_CFG_CHAN_LIST_SCAN:     
+        case eCSR_NEIGHBOR_ROAM_STATE_CFG_CHAN_LIST_SCAN:
             csrNeighborRoamPerformBgScan(pMac, sessionId);
             break;
         default:
@@ -2807,8 +2807,8 @@ void csrNeighborRoamEmptyScanRefreshTimerCallback(void *context)
     \fn csrNeighborRoamResultsRefreshTimerCallback
 
     \brief  This function is the timer callback function for results refresh timer.
-            When this is invoked, it is as good as down event received from TL. So, 
-            clear off the roamable AP list and start the scan procedure based on 11R 
+            When this is invoked, it is as good as down event received from TL. So,
+            clear off the roamable AP list and start the scan procedure based on 11R
             or non-11R association
 
     \param  context - CSR timer context info which includes pMac and session ID
@@ -2822,15 +2822,15 @@ void csrNeighborRoamResultsRefreshTimerCallback(void *context)
     tpAniSirGlobal pMac = pInfo->pMac;
     VOS_STATUS     vosStatus = VOS_STATUS_SUCCESS;
     tpCsrNeighborRoamControlInfo    pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
-     
+
     NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Deregistering DOWN event reassoc callback with TL. RSSI = %d"), pNeighborRoamInfo->cfgParams.neighborReassocThreshold * (-1));
 
     /* Deregister reassoc callback. Ignore return status */
     vosStatus = WLANTL_DeregRSSIIndicationCB(pMac->roam.gVosContext, (v_S7_t)pNeighborRoamInfo->cfgParams.neighborReassocThreshold * (-1),
-                                                        WLANTL_HO_THRESHOLD_DOWN, 
+                                                        WLANTL_HO_THRESHOLD_DOWN,
                                                         csrNeighborRoamReassocIndCallback,
                                                         VOS_MODULE_ID_SME);
-                        
+
     if(!VOS_IS_STATUS_SUCCESS(vosStatus))
     {
         //err msg
@@ -2856,7 +2856,7 @@ void csrNeighborRoamResultsRefreshTimerCallback(void *context)
         CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_REPORT_QUERY)
     }
     else
-#endif      
+#endif
     {
         NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Non 11R or CCX Association:results refresh timer expired"));
         vosStatus = csrNeighborRoamTransitToCFGChanScan(pMac);
@@ -2873,8 +2873,8 @@ void csrNeighborRoamResultsRefreshTimerCallback(void *context)
 
     \fn csrNeighborRoamIssueNeighborRptRequest
 
-    \brief  This function is invoked when TL issues a down event and the current assoc 
-            is a 11R association. It invokes SME RRM API to issue the neighbor request to 
+    \brief  This function is invoked when TL issues a down event and the current assoc
+            is a 11R association. It invokes SME RRM API to issue the neighbor request to
             the currently associated AP with the current SSID
 
     \param  pMac - The handle returned by macOpen.
@@ -2893,9 +2893,9 @@ VOS_STATUS csrNeighborRoamIssueNeighborRptRequest(tpAniSirGlobal pMac)
 
     /* Fill in the SSID */
     neighborReq.ssid.length = pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.length;
-    vos_mem_copy(neighborReq.ssid.ssId, pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.ssId, 
+    vos_mem_copy(neighborReq.ssid.ssId, pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.ssId,
                                     pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.length);
-    
+
     callbackInfo.neighborRspCallback = csrNeighborRoamRRMNeighborReportResult;
     callbackInfo.neighborRspCallbackContext = pMac;
     callbackInfo.timeout = pNeighborRoamInfo->FTRoamInfo.neighborReportTimeout;
@@ -2962,7 +2962,7 @@ VOS_STATUS csrNeighborRoamChannelsFilterByCurrentBand(
 
 /* ---------------------------------------------------------------------------
 
-    \fn csrNeighborRoamMergeChannelLists 
+    \fn csrNeighborRoamMergeChannelLists
 
     \brief  This function is used to merge two channel list.
             NB: If called with outputNumOfChannels == 0, this routines
@@ -2978,8 +2978,8 @@ VOS_STATUS csrNeighborRoamChannelsFilterByCurrentBand(
     \return VOS_STATUS_SUCCESS on success, corresponding error code otherwise
 
 ---------------------------------------------------------------------------*/
-VOS_STATUS csrNeighborRoamMergeChannelLists( 
-        tpAniSirGlobal pMac, 
+VOS_STATUS csrNeighborRoamMergeChannelLists(
+        tpAniSirGlobal pMac,
         tANI_U8 *pInputChannelList,
         tANI_U8 inputNumOfChannels,
         tANI_U8 *pOutputChannelList,
@@ -3016,17 +3016,17 @@ VOS_STATUS csrNeighborRoamMergeChannelLists(
         {
             if (pInputChannelList[i])
             {
-                VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+                VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                         "%s: [INFOLOG] Adding extra %d to Neighbor channel list", __func__,
-                        pInputChannelList[i]); 
-                pOutputChannelList[numChannels] = pInputChannelList[i]; 
-                numChannels++; 
+                        pInputChannelList[i]);
+                pOutputChannelList[numChannels] = pInputChannelList[i];
+                numChannels++;
             }
         }
     }
 
     // Return final number of channels
-    *pMergedOutputNumOfChannels = numChannels; 
+    *pMergedOutputNumOfChannels = numChannels;
 
     return VOS_STATUS_SUCCESS;
 }
@@ -3035,8 +3035,8 @@ VOS_STATUS csrNeighborRoamMergeChannelLists(
 
     \fn csrNeighborRoamCreateChanListFromNeighborReport
 
-    \brief  This function is invoked when neighbor report is received for the 
-            neighbor request. Based on the channels present in the neighbor report, 
+    \brief  This function is invoked when neighbor report is received for the
+            neighbor request. Based on the channels present in the neighbor report,
             it generates channel list which will be used in REPORT_SCAN state to
             scan for these neighbor APs
 
@@ -3064,11 +3064,11 @@ VOS_STATUS csrNeighborRoamCreateChanListFromNeighborReport(tpAniSirGlobal pMac)
     while (pNeighborBssDesc)
     {
         if (pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport >= MAX_BSS_IN_NEIGHBOR_RPT) break;
-        
+
         /* Update the neighbor BSS Info in the 11r FT Roam Info */
-        pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo[pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport].channelNum = 
+        pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo[pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport].channelNum =
                                     pNeighborBssDesc->pNeighborBssDescription->channel;
-        pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo[pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport].neighborScore = 
+        pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo[pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport].neighborScore =
                                     (tANI_U8)pNeighborBssDesc->roamScore;
         vos_mem_copy(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo[pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport].neighborBssId,
                                      pNeighborBssDesc->pNeighborBssDescription->bssId, sizeof(tSirMacAddr));
@@ -3082,7 +3082,7 @@ VOS_STATUS csrNeighborRoamCreateChanListFromNeighborReport(tpAniSirGlobal pMac)
                 if (pNeighborBssDesc->pNeighborBssDescription->channel == channelList[i])
                     break;
             }
-            
+
         }
         if (i == numChannels)
         {
@@ -3111,7 +3111,7 @@ VOS_STATUS csrNeighborRoamCreateChanListFromNeighborReport(tpAniSirGlobal pMac)
                 }
             }
         }
-            
+
         pNeighborBssDesc = smeRrmGetNextBssEntryFromNeighborCache(pMac, pNeighborBssDesc);
     }
 
@@ -3119,13 +3119,13 @@ VOS_STATUS csrNeighborRoamCreateChanListFromNeighborReport(tpAniSirGlobal pMac)
     {
 #if 0
         // Before we free the existing channel list for a safety net make sure
-        // we have a union of the IAPP and the already existing list. 
-        status = csrNeighborRoamMergeChannelLists( 
-                pMac, 
-                pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList, 
-                pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels, 
-                channelList, 
-                numChannels, 
+        // we have a union of the IAPP and the already existing list.
+        status = csrNeighborRoamMergeChannelLists(
+                pMac,
+                pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList,
+                pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels,
+                channelList,
+                numChannels,
                 &numChannels );
 #endif
 
@@ -3143,7 +3143,7 @@ VOS_STATUS csrNeighborRoamCreateChanListFromNeighborReport(tpAniSirGlobal pMac)
         return VOS_STATUS_E_RESOURCES;
     }
 
-    vos_mem_copy(pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList, 
+    vos_mem_copy(pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList,
                                             channelList, (numChannels) * sizeof(tANI_U8));
     pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels = numChannels;
     /*
@@ -3180,7 +3180,7 @@ VOS_STATUS csrNeighborRoamCreateChanListFromNeighborReport(tpAniSirGlobal pMac)
     }
     pNeighborRoamInfo->roamChannelInfo.currentChanIndex = 0;
     pNeighborRoamInfo->roamChannelInfo.chanListScanInProgress = eANI_BOOLEAN_TRUE;
-    
+
     return VOS_STATUS_SUCCESS;
 }
 
@@ -3188,10 +3188,10 @@ VOS_STATUS csrNeighborRoamCreateChanListFromNeighborReport(tpAniSirGlobal pMac)
 
     \fn csrNeighborRoamRRMNeighborReportResult
 
-    \brief  This function is the neighbor report callback that will be invoked by 
-            SME RRM on receiving a neighbor report or of neighbor report is not 
-            received after timeout. On receiving a valid report, it generates a 
-            channel list from the neighbor report and starts the 
+    \brief  This function is the neighbor report callback that will be invoked by
+            SME RRM on receiving a neighbor report or of neighbor report is not
+            received after timeout. On receiving a valid report, it generates a
+            channel list from the neighbor report and starts the
             neighbor scan timer
 
     \param  context - The handle returned by macOpen.
@@ -3223,9 +3223,9 @@ void csrNeighborRoamRRMNeighborReportResult(void *context, VOS_STATUS vosStatus)
 
                 /* We are gonna scan now. Remember the time stamp to filter out results only after this timestamp */
                 pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
-                
+
                 /* Now ready for neighbor scan based on the channel list created */
-                /* Start Neighbor scan timer now. Multiplication by PAL_TIMER_TO_MS_UNIT is to convert ms to us which is 
+                /* Start Neighbor scan timer now. Multiplication by PAL_TIMER_TO_MS_UNIT is to convert ms to us which is
                    what palTimerStart expects */
                 status = vos_timer_start(&pNeighborRoamInfo->neighborScanTimer,
                                 pNeighborRoamInfo->cfgParams.neighborScanPeriod);
@@ -3238,17 +3238,17 @@ void csrNeighborRoamRRMNeighborReportResult(void *context, VOS_STATUS vosStatus)
                     pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels = 0;
                     return;
                 }
-                pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0;                
+                pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0;
                 /* Neighbor scan timer started. Transition to REPORT_SCAN state */
                 CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_REPORT_SCAN)
             }
             else
             {
-                /* Neighbor report timeout happened in SME RRM. We can try sending more neighbor requests until we 
+                /* Neighbor report timeout happened in SME RRM. We can try sending more neighbor requests until we
                                 reach the maxNeighborRetries or receiving a successful neighbor response */
                 smsLog(pMac, LOGE, FL("Neighbor report result failed after %d retries, MAX RETRIES = %d"),
                      pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum, pNeighborRoamInfo->cfgParams.maxNeighborRetries);
-                if (pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum >= 
+                if (pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum >=
                         pNeighborRoamInfo->cfgParams.maxNeighborRetries)
                 {
                     smsLog(pMac, LOGE, FL("Bailing out to CFG Channel list scan.. "));
@@ -3284,9 +3284,9 @@ void csrNeighborRoamRRMNeighborReportResult(void *context, VOS_STATUS vosStatus)
 #endif /* WLAN_FEATURE_VOWIFI_11R */
 
 
-#ifdef FEATURE_WLAN_LFR 
+#ifdef FEATURE_WLAN_LFR
 tANI_BOOLEAN csrNeighborRoamIsSsidAndSecurityMatch(
-        tpAniSirGlobal pMac, 
+        tpAniSirGlobal pMac,
         tCsrRoamConnectedProfile *pCurProfile,
         tSirBssDescription *pBssDesc,
         tDot11fBeaconIEs *pIes)
@@ -3433,7 +3433,7 @@ tANI_BOOLEAN csrNeighborRoamConnectedProfileMatch(
 
 ---------------------------------------------------------------------------*/
 VOS_STATUS csrNeighborRoamPrepareNonOccupiedChannelList(
-        tpAniSirGlobal pMac, 
+        tpAniSirGlobal pMac,
         tANI_U8 *pInputChannelList,
         tANI_U8 numOfChannels,
         tANI_U8 *pOutputChannelList,
@@ -3459,7 +3459,7 @@ VOS_STATUS csrNeighborRoamPrepareNonOccupiedChannelList(
             numOfChannels, outputNumOfChannels);
 
     // Return the number of channels
-    *pOutputNumOfChannels = outputNumOfChannels; 
+    *pOutputNumOfChannels = outputNumOfChannels;
 
     return eHAL_STATUS_SUCCESS;
 }
@@ -3469,9 +3469,9 @@ VOS_STATUS csrNeighborRoamPrepareNonOccupiedChannelList(
 
     \fn csrNeighborRoamTransitToCFGChanScan
 
-    \brief  This function is called whenever there is a transition to CFG chan scan 
-            state from any state. It frees up the current channel list and allocates 
-            a new memory for the channels received from CFG item. It then starts the 
+    \brief  This function is called whenever there is a transition to CFG chan scan
+            state from any state. It frees up the current channel list and allocates
+            a new memory for the channels received from CFG item. It then starts the
             neighbor scan timer to perform the scan on each channel one by one
 
     \param  pMac - The handle returned by macOpen.
@@ -3492,19 +3492,19 @@ VOS_STATUS csrNeighborRoamTransitToCFGChanScan(tpAniSirGlobal pMac)
 #endif
     currChannelListInfo = &pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo;
 
-    if ( 
+    if (
 #ifdef FEATURE_WLAN_CCX
-        ((pNeighborRoamInfo->isCCXAssoc) && 
+        ((pNeighborRoamInfo->isCCXAssoc) &&
                     (pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived == eANI_BOOLEAN_FALSE)) ||
-        (pNeighborRoamInfo->isCCXAssoc == eANI_BOOLEAN_FALSE) || 
+        (pNeighborRoamInfo->isCCXAssoc == eANI_BOOLEAN_FALSE) ||
 #endif // CCX
         currChannelListInfo->numOfChannels == 0)
     {
         smsLog(pMac, LOGW, FL("Building channel list to scan"));
 
 
-        /* Free up the channel list and allocate a new memory. This is because we dont know how much 
-            was allocated last time. If we directly copy more number of bytes than allocated earlier, this might 
+        /* Free up the channel list and allocate a new memory. This is because we dont know how much
+            was allocated last time. If we directly copy more number of bytes than allocated earlier, this might
             result in memory corruption */
         if (NULL != currChannelListInfo->ChannelList)
         {
@@ -3519,11 +3519,11 @@ VOS_STATUS csrNeighborRoamTransitToCFGChanScan(tpAniSirGlobal pMac)
         {
             // Copy the "default valid channel list" (channelList) from the gNeighborScanChannelList in "cfg.ini".
             NEIGHBOR_ROAM_DEBUG(pMac, LOGE, "Using the channel list from cfg.ini");
-            status = csrNeighborRoamMergeChannelLists( 
-                    pMac, 
-                    pNeighborRoamInfo->cfgParams.channelInfo.ChannelList, 
-                    pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels, 
-                    channelList, 
+            status = csrNeighborRoamMergeChannelLists(
+                    pMac,
+                    pNeighborRoamInfo->cfgParams.channelInfo.ChannelList,
+                    pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels,
+                    channelList,
                     0, //NB: If 0, simply copy the input channel list to the output list.
                     &numOfChannels );
 
@@ -3550,16 +3550,16 @@ VOS_STATUS csrNeighborRoamTransitToCFGChanScan(tpAniSirGlobal pMac)
             }
             vos_mem_copy(currChannelListInfo->ChannelList,
                   channelList, numOfChannels * sizeof(tANI_U8));
-        } 
+        }
 #ifdef FEATURE_WLAN_LFR
         else if ((pNeighborRoamInfo->uScanMode == DEFAULT_SCAN) &&
                  (abs(pNeighborRoamInfo->lookupDOWNRssi) >
                   abs(pNeighborRoamInfo->cfgParams.neighborReassocThreshold)))
         {
-            /* 
+            /*
              * Trigger a contiguous scan on all channels when the
-             * RSSI in the lookup DOWN notification is below reassoc 
-             * threshold. This will help us find the best available 
+             * RSSI in the lookup DOWN notification is below reassoc
+             * threshold. This will help us find the best available
              * candidate and also update the channel cache.
              */
             NEIGHBOR_ROAM_DEBUG(pMac, LOGW, "Triggering contiguous scan "
@@ -3571,7 +3571,7 @@ VOS_STATUS csrNeighborRoamTransitToCFGChanScan(tpAniSirGlobal pMac)
 
             vos_timer_stop(&pNeighborRoamInfo->neighborScanTimer);
 
-            /* We are about to start a fresh scan cycle, 
+            /* We are about to start a fresh scan cycle,
              * purge non-P2P results from the past */
             csrScanFlushSelectiveResult(pMac, VOS_FALSE);
 
@@ -3664,7 +3664,7 @@ VOS_STATUS csrNeighborRoamTransitToCFGChanScan(tpAniSirGlobal pMac)
                             &numOfChannels);
 #else
                 NEIGHBOR_ROAM_DEBUG(pMac, LOG2, "Merging channel list");
-                status = csrNeighborRoamMergeChannelLists( 
+                status = csrNeighborRoamMergeChannelLists(
                             pMac,
                             (tANI_U8 *)pMac->roam.validChannelList,
                             numOfChannels,   // The number of channels in the validChannelList
@@ -3714,7 +3714,7 @@ VOS_STATUS csrNeighborRoamTransitToCFGChanScan(tpAniSirGlobal pMac)
 
         /* Adjust for the actual number that are used */
         currChannelListInfo->numOfChannels = numOfChannels;
-        NEIGHBOR_ROAM_DEBUG(pMac, LOGW, 
+        NEIGHBOR_ROAM_DEBUG(pMac, LOGW,
             "Number of channels from CFG (or) (non-)occupied list=%d",
             currChannelListInfo->numOfChannels);
         for (i = 0; i < currChannelListInfo->numOfChannels; i++)
@@ -3726,13 +3726,13 @@ VOS_STATUS csrNeighborRoamTransitToCFGChanScan(tpAniSirGlobal pMac)
 
     /* We are gonna scan now. Remember the time stamp to filter out results only after this timestamp */
     pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
-    
+
     vos_timer_stop(&pNeighborRoamInfo->neighborScanTimer);
-    /* Start Neighbor scan timer now. Multiplication by PAL_TIMER_TO_MS_UNIT is to convert ms to us which is 
+    /* Start Neighbor scan timer now. Multiplication by PAL_TIMER_TO_MS_UNIT is to convert ms to us which is
             what palTimerStart expects */
     status = vos_timer_start(&pNeighborRoamInfo->neighborScanTimer,
                     pNeighborRoamInfo->cfgParams.neighborScanPeriod);
-    
+
     if (eHAL_STATUS_SUCCESS != status)
     {
         /* Timer start failed..  */
@@ -3742,17 +3742,17 @@ VOS_STATUS csrNeighborRoamTransitToCFGChanScan(tpAniSirGlobal pMac)
         currChannelListInfo->numOfChannels = 0;
         return VOS_STATUS_E_FAILURE;
     }
-    
+
     pNeighborRoamInfo->roamChannelInfo.currentChanIndex = 0;
     pNeighborRoamInfo->roamChannelInfo.chanListScanInProgress = eANI_BOOLEAN_TRUE;
-    /* We are about to start a fresh scan cycle, 
+    /* We are about to start a fresh scan cycle,
      * purge non-P2P results from the past */
     csrScanFlushSelectiveResult(pMac, VOS_FALSE);
 
     /* We are about to start a fresh scan cycle,
      * purge failed pre-auth results from the past */
     csrNeighborRoamPurgePreauthFailedList(pMac);
-    
+
     /* Transition to CFG_CHAN_LIST_SCAN_STATE */
     CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_CFG_CHAN_LIST_SCAN)
 
@@ -3763,8 +3763,8 @@ VOS_STATUS csrNeighborRoamTransitToCFGChanScan(tpAniSirGlobal pMac)
 
     \fn csrNeighborRoamNeighborLookupUpEvent
 
-    \brief  This function is called as soon as TL indicates that the current AP's 
-            RSSI is better than the neighbor lookup threshold. Here, we transition to 
+    \brief  This function is called as soon as TL indicates that the current AP's
+            RSSI is better than the neighbor lookup threshold. Here, we transition to
             CONNECTED state and reset all the scan parameters
 
     \param  pMac - The handle returned by macOpen.
@@ -3791,12 +3791,12 @@ VOS_STATUS  csrNeighborRoamNeighborLookupUpEvent(tpAniSirGlobal pMac)
     /* Reset all the neighbor roam info control variables. Free all the allocated memory. It is like we are just associated now */
     csrNeighborRoamResetConnectedStateControlInfo(pMac);
 
-    
+
     NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Registering DOWN event neighbor lookup callback with TL. RSSI = %d,"), pNeighborRoamInfo->currentNeighborLookupThreshold * (-1));
     /* Register Neighbor Lookup threshold callback with TL for DOWN event now */
     vosStatus = WLANTL_RegRSSIIndicationCB(pMac->roam.gVosContext, (v_S7_t)pNeighborRoamInfo->currentNeighborLookupThreshold * (-1),
-                                    WLANTL_HO_THRESHOLD_DOWN, 
-                                    csrNeighborRoamNeighborLookupDOWNCallback, 
+                                    WLANTL_HO_THRESHOLD_DOWN,
+                                    csrNeighborRoamNeighborLookupDOWNCallback,
                                     VOS_MODULE_ID_SME, pMac);
 #ifdef FEATURE_WLAN_LFR
     pNeighborRoamInfo->lookupDOWNRssi = 0;
@@ -3815,9 +3815,9 @@ VOS_STATUS  csrNeighborRoamNeighborLookupUpEvent(tpAniSirGlobal pMac)
 
     \fn csrNeighborRoamNeighborLookupDownEvent
 
-    \brief  This function is called as soon as TL indicates that the current AP's 
-            RSSI falls below the current eighbor lookup threshold. Here, we transition to 
-            REPORT_QUERY for 11r association and CFG_CHAN_LIST_SCAN state if the assoc is 
+    \brief  This function is called as soon as TL indicates that the current AP's
+            RSSI falls below the current eighbor lookup threshold. Here, we transition to
+            REPORT_QUERY for 11r association and CFG_CHAN_LIST_SCAN state if the assoc is
             a non-11R association.
 
     \param  pMac - The handle returned by macOpen.
@@ -3834,15 +3834,15 @@ VOS_STATUS  csrNeighborRoamNeighborLookupDownEvent(tpAniSirGlobal pMac)
     switch (pNeighborRoamInfo->neighborRoamState)
     {
         case eCSR_NEIGHBOR_ROAM_STATE_CONNECTED:
-            
+
             NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Deregistering DOWN event neighbor lookup callback with TL. RSSI = %d,"),
                                                             pNeighborRoamInfo->currentNeighborLookupThreshold * (-1));
             /* De-register Neighbor Lookup threshold callback with TL */
             vosStatus = WLANTL_DeregRSSIIndicationCB(pMac->roam.gVosContext, (v_S7_t)pNeighborRoamInfo->currentNeighborLookupThreshold * (-1),
-                                            WLANTL_HO_THRESHOLD_DOWN, 
-                                            csrNeighborRoamNeighborLookupDOWNCallback, 
+                                            WLANTL_HO_THRESHOLD_DOWN,
+                                            csrNeighborRoamNeighborLookupDOWNCallback,
                                             VOS_MODULE_ID_SME);
-            
+
             if(!VOS_IS_STATUS_SUCCESS(vosStatus))
             {
                //err msg
@@ -3855,11 +3855,11 @@ VOS_STATUS  csrNeighborRoamNeighborLookupDownEvent(tpAniSirGlobal pMac)
                 return eHAL_STATUS_SUCCESS;
             }
 #endif
-           
+
 #if defined WLAN_FEATURE_VOWIFI_11R && defined WLAN_FEATURE_VOWIFI
             if ((pNeighborRoamInfo->is11rAssoc) && (pMac->rrm.rrmSmeContext.rrmConfig.rrmEnabled))
             {
-               
+
                 NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("11R Association:Neighbor Lookup Down event received in CONNECTED state"));
                 vosStatus = csrNeighborRoamIssueNeighborRptRequest(pMac);
                 if (VOS_STATUS_SUCCESS != vosStatus)
@@ -3873,7 +3873,7 @@ VOS_STATUS  csrNeighborRoamNeighborLookupDownEvent(tpAniSirGlobal pMac)
                 CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_REPORT_QUERY)
             }
             else
-#endif      
+#endif
             {
                 NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Non 11R or CCX Association:Neighbor Lookup Down event received in CONNECTED state"));
 
@@ -3889,8 +3889,8 @@ VOS_STATUS  csrNeighborRoamNeighborLookupDownEvent(tpAniSirGlobal pMac)
             /* Register Neighbor Lookup threshold callback with TL for UP event now */
             vosStatus = WLANTL_RegRSSIIndicationCB(pMac->roam.gVosContext,
                                             (v_S7_t)NEIGHBOR_ROAM_LOOKUP_UP_THRESHOLD * (-1),
-                                            WLANTL_HO_THRESHOLD_UP, 
-                                            csrNeighborRoamNeighborLookupUPCallback, 
+                                            WLANTL_HO_THRESHOLD_UP,
+                                            csrNeighborRoamNeighborLookupUPCallback,
                                             VOS_MODULE_ID_SME, pMac);
             if(!VOS_IS_STATUS_SUCCESS(vosStatus))
             {
@@ -3901,7 +3901,7 @@ VOS_STATUS  csrNeighborRoamNeighborLookupDownEvent(tpAniSirGlobal pMac)
         default:
             smsLog(pMac, LOGE, FL("DOWN event received in invalid state %d..Ignoring..."), pNeighborRoamInfo->neighborRoamState);
             break;
-            
+
     }
     return vosStatus;
 }
@@ -3910,7 +3910,7 @@ VOS_STATUS  csrNeighborRoamNeighborLookupDownEvent(tpAniSirGlobal pMac)
 
     \fn csrNeighborRoamNeighborLookupUPCallback
 
-    \brief  This function is registered with TL to indicate whenever the RSSI 
+    \brief  This function is registered with TL to indicate whenever the RSSI
             gets better than the neighborLookup RSSI Threshold
 
     \param  pAdapter - VOS Context
@@ -3951,7 +3951,7 @@ VOS_STATUS csrNeighborRoamNeighborLookupUPCallback (v_PVOID_t pAdapter, v_U8_t r
 
     \fn csrNeighborRoamNeighborLookupDOWNCallback
 
-    \brief  This function is registered with TL to indicate whenever the RSSI 
+    \brief  This function is registered with TL to indicate whenever the RSSI
             falls below the current neighborLookup RSSI Threshold
 
     \param  pAdapter - VOS Context
@@ -4000,9 +4000,9 @@ extern int dumpCmdRSSI;
 
     \fn csrNeighborRoamIndicateDisconnect
 
-    \brief  This function is called by CSR as soon as the station disconnects from 
-            the AP. This function does the necessary cleanup of neighbor roam data 
-            structures. Neighbor roam state transitions to INIT state whenever this 
+    \brief  This function is called by CSR as soon as the station disconnects from
+            the AP. This function does the necessary cleanup of neighbor roam data
+            structures. Neighbor roam state transitions to INIT state whenever this
             function is called except if the current state is REASSOCIATING
 
     \param  pMac - The handle returned by macOpen.
@@ -4027,7 +4027,7 @@ eHalStatus csrNeighborRoamIndicateDisconnect(tpAniSirGlobal pMac, tANI_U8 sessio
     smsLog(pMac, LOGE, FL("Disconnect indication on session %d in state %d from BSSID : "
                           MAC_ADDRESS_STR), sessionId, pNeighborRoamInfo->neighborRoamState,
                           MAC_ADDR_ARRAY(pSession->connectedProfile.bssid));
- 
+
 #ifdef FEATURE_WLAN_LFR
     /*Free the current previous profile and move the current profile to prev profile.*/
     csrRoamFreeConnectProfile(pMac, pPrevProfile);
@@ -4059,7 +4059,7 @@ eHalStatus csrNeighborRoamIndicateDisconnect(tpAniSirGlobal pMac, tANI_U8 sessio
         }
 #endif
     } //if (NULL != pSession)
-   
+
 #ifdef RSSI_HACK
     dumpCmdRSSI = -40;
 #endif
@@ -4076,8 +4076,8 @@ eHalStatus csrNeighborRoamIndicateDisconnect(tpAniSirGlobal pMac, tANI_U8 sessio
                 /*
                  * Disconnect indication during Disassoc Handoff sub-state
                  * is received when we are trying to disconnect with the old
-                 * AP during roam. BUT, if receive a disconnect indication 
-                 * outside of Disassoc Handoff sub-state, then it means that 
+                 * AP during roam. BUT, if receive a disconnect indication
+                 * outside of Disassoc Handoff sub-state, then it means that
                  * this is a genuine disconnect and we need to clean up.
                  * Otherwise, we will be stuck in reassoc state which will
                  * in-turn block scans (see csrIsScanAllowed).
@@ -4097,7 +4097,7 @@ eHalStatus csrNeighborRoamIndicateDisconnect(tpAniSirGlobal pMac, tANI_U8 sessio
 #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
             }
 #endif
-            break; 
+            break;
 
         case eCSR_NEIGHBOR_ROAM_STATE_CONNECTED:
             CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT)
@@ -4168,7 +4168,7 @@ eHalStatus csrNeighborRoamIndicateDisconnect(tpAniSirGlobal pMac, tANI_U8 sessio
     \fn csrNeighborRoamIndicateConnect
 
     \brief  This function is called by CSR as soon as the station connects to an AP.
-            This initializes all the necessary data structures related to the 
+            This initializes all the necessary data structures related to the
             associated AP and transitions the state to CONNECTED state
 
     \param  pMac - The handle returned by macOpen.
@@ -4233,7 +4233,7 @@ eHalStatus csrNeighborRoamIndicateConnect(tpAniSirGlobal pMac, tANI_U8 sessionId
             }
             /* Fall through if the status is SUCCESS */
         case eCSR_NEIGHBOR_ROAM_STATE_INIT:
-            /* Reset all the data structures here */ 
+            /* Reset all the data structures here */
             csrNeighborRoamResetInitStateControlInfo(pMac);
 
             pNeighborRoamInfo->csrSessionId = sessionId;
@@ -4248,7 +4248,7 @@ eHalStatus csrNeighborRoamIndicateConnect(tpAniSirGlobal pMac, tANI_U8 sessionId
 #endif
             CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_CONNECTED);
 
-            vos_mem_copy(pNeighborRoamInfo->currAPbssid, 
+            vos_mem_copy(pNeighborRoamInfo->currAPbssid,
                         pMac->roam.roamSession[sessionId].connectedProfile.bssid, sizeof(tCsrBssid));
             pNeighborRoamInfo->currAPoperationChannel = pMac->roam.roamSession[sessionId].connectedProfile.operationChannel;
             pNeighborRoamInfo->neighborScanTimerInfo.pMac = pMac;
@@ -4265,15 +4265,15 @@ eHalStatus csrNeighborRoamIndicateConnect(tpAniSirGlobal pMac, tANI_U8 sessionId
             pNeighborRoamInfo->uScanMode = DEFAULT_SCAN;
 #endif
 
-            
+
 #if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
             /* Now we can clear the preauthDone that was saved as we are connected afresh */
             csrNeighborRoamFreeRoamableBSSList(pMac, &pMac->roam.neighborRoamInfo.FTRoamInfo.preAuthDoneList);
 #endif
-            
+
 #ifdef WLAN_FEATURE_VOWIFI_11R
             // Based on the auth scheme tell if we are 11r
-            if ( csrIsAuthType11r( pMac->roam.roamSession[sessionId].connectedProfile.AuthType, 
+            if ( csrIsAuthType11r( pMac->roam.roamSession[sessionId].connectedProfile.AuthType,
                                    pMac->roam.roamSession[sessionId].connectedProfile.MDID.mdiePresent))
             {
                 if (pMac->roam.configParam.isFastTransitionEnabled)
@@ -4297,11 +4297,11 @@ eHalStatus csrNeighborRoamIndicateConnect(tpAniSirGlobal pMac, tANI_U8 sessionId
                 pNeighborRoamInfo->isCCXAssoc = eANI_BOOLEAN_FALSE;
             NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("isCCXAssoc is = %d ft = %d"),
                                 pNeighborRoamInfo->isCCXAssoc, init_ft_flag);
-                            
+
 #endif
 
 #ifdef FEATURE_WLAN_LFR
-            // If "Legacy Fast Roaming" is enabled 
+            // If "Legacy Fast Roaming" is enabled
             if (csrRoamIsFastRoamEnabled(pMac, sessionId))
             {
                 init_ft_flag = TRUE;
@@ -4331,8 +4331,8 @@ eHalStatus csrNeighborRoamIndicateConnect(tpAniSirGlobal pMac, tANI_U8 sessionId
                 NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Registering neighbor lookup DOWN event with TL, RSSI = %d"), pNeighborRoamInfo->currentNeighborLookupThreshold);
                 /* Register Neighbor Lookup threshold callback with TL for DOWN event only */
                 vstatus = WLANTL_RegRSSIIndicationCB(pMac->roam.gVosContext, (v_S7_t)pNeighborRoamInfo->currentNeighborLookupThreshold * (-1),
-                                            WLANTL_HO_THRESHOLD_DOWN, 
-                                            csrNeighborRoamNeighborLookupDOWNCallback, 
+                                            WLANTL_HO_THRESHOLD_DOWN,
+                                            csrNeighborRoamNeighborLookupDOWNCallback,
                                             VOS_MODULE_ID_SME, pMac);
 #ifdef FEATURE_WLAN_LFR
                 pNeighborRoamInfo->lookupDOWNRssi = 0;
@@ -4404,13 +4404,13 @@ eHalStatus csrNeighborRoamInit11rAssocInfo(tpAniSirGlobal pMac)
     pFTRoamInfo->PEPreauthRespTimeout = CSR_NEIGHBOR_ROAM_PREAUTH_RSP_WAIT_MULTIPLIER * pMac->roam.neighborRoamInfo.cfgParams.neighborScanPeriod;
     pFTRoamInfo->neighborRptPending = eANI_BOOLEAN_FALSE;
     pFTRoamInfo->preauthRspPending = eANI_BOOLEAN_FALSE;
-    
+
     pMac->roam.neighborRoamInfo.FTRoamInfo.currentNeighborRptRetryNum = 0;
     pMac->roam.neighborRoamInfo.FTRoamInfo.numBssFromNeighborReport = 0;
-    vos_mem_zero(pMac->roam.neighborRoamInfo.FTRoamInfo.neighboReportBssInfo, 
+    vos_mem_zero(pMac->roam.neighborRoamInfo.FTRoamInfo.neighboReportBssInfo,
                             sizeof(tCsrNeighborReportBssInfo) * MAX_BSS_IN_NEIGHBOR_RPT);
 
-    
+
     status = csrLLOpen(pMac->hHdd, &pFTRoamInfo->preAuthDoneList);
     if (eHAL_STATUS_SUCCESS != status)
     {
@@ -4586,9 +4586,9 @@ void csrNeighborRoamClose(tpAniSirGlobal pMac)
 
     if (pNeighborRoamInfo->cfgParams.channelInfo.ChannelList)
         vos_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.ChannelList);
-   
+
     pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL;
-    
+
     pNeighborRoamInfo->neighborScanTimerInfo.pMac = NULL;
     pNeighborRoamInfo->neighborScanTimerInfo.sessionId = CSR_SESSION_ID_INVALID;
     vos_timer_destroy(&pNeighborRoamInfo->neighborScanTimer);
@@ -4598,7 +4598,7 @@ void csrNeighborRoamClose(tpAniSirGlobal pMac)
     /* Should free up the nodes in the list before closing the double Linked list */
     csrNeighborRoamFreeRoamableBSSList(pMac, &pNeighborRoamInfo->roamableAPList);
     csrLLClose(&pNeighborRoamInfo->roamableAPList);
-    
+
     if (pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList)
     {
         vos_mem_free(pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList);
@@ -4608,25 +4608,25 @@ void csrNeighborRoamClose(tpAniSirGlobal pMac)
     pNeighborRoamInfo->roamChannelInfo.currentChanIndex = CSR_NEIGHBOR_ROAM_INVALID_CHANNEL_INDEX;
     pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels = 0;
     pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList = NULL;
-    pNeighborRoamInfo->roamChannelInfo.chanListScanInProgress = eANI_BOOLEAN_FALSE;    
+    pNeighborRoamInfo->roamChannelInfo.chanListScanInProgress = eANI_BOOLEAN_FALSE;
     pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
 
-    /* Free the profile.. */ 
+    /* Free the profile.. */
     csrReleaseProfile(pMac, &pNeighborRoamInfo->csrNeighborRoamProfile);
-#ifdef FEATURE_WLAN_LFR    
+#ifdef FEATURE_WLAN_LFR
     csrRoamFreeConnectProfile(pMac, &pNeighborRoamInfo->prevConnProfile);
 #endif
 #ifdef WLAN_FEATURE_VOWIFI_11R
     pMac->roam.neighborRoamInfo.FTRoamInfo.currentNeighborRptRetryNum = 0;
     pMac->roam.neighborRoamInfo.FTRoamInfo.numBssFromNeighborReport = 0;
-    vos_mem_zero(pMac->roam.neighborRoamInfo.FTRoamInfo.neighboReportBssInfo, 
+    vos_mem_zero(pMac->roam.neighborRoamInfo.FTRoamInfo.neighboReportBssInfo,
                             sizeof(tCsrNeighborReportBssInfo) * MAX_BSS_IN_NEIGHBOR_RPT);
     csrNeighborRoamFreeRoamableBSSList(pMac, &pMac->roam.neighborRoamInfo.FTRoamInfo.preAuthDoneList);
     csrLLClose(&pMac->roam.neighborRoamInfo.FTRoamInfo.preAuthDoneList);
 #endif /* WLAN_FEATURE_VOWIFI_11R */
 
     CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_CLOSED)
-    
+
     return;
 }
 
@@ -4635,7 +4635,7 @@ void csrNeighborRoamClose(tpAniSirGlobal pMac)
     \fn csrNeighborRoamRequestHandoff
 
     \brief  This function triggers actual switching from one AP to the new AP.
-            It issues disassociate with reason code as Handoff and CSR as a part of 
+            It issues disassociate with reason code as Handoff and CSR as a part of
             handling disassoc rsp, issues reassociate to the new AP
 
     \param  pMac - The handle returned by macOpen.
@@ -4657,7 +4657,7 @@ void csrNeighborRoamRequestHandoff(tpAniSirGlobal pMac)
     tCsrRoamInfo *roamInfoMetrics;
 #endif
 
-    if (pMac->roam.neighborRoamInfo.neighborRoamState != eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE) 
+    if (pMac->roam.neighborRoamInfo.neighborRoamState != eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE)
     {
         smsLog(pMac, LOGE, FL("Roam requested when Neighbor roam is in %d state"),
             pMac->roam.neighborRoamInfo.neighborRoamState);
@@ -4665,12 +4665,12 @@ void csrNeighborRoamRequestHandoff(tpAniSirGlobal pMac)
     }
 
     vos_mem_zero(&roamInfo, sizeof(tCsrRoamInfo));
-    csrRoamCallCallback(pMac, pNeighborRoamInfo->csrSessionId, &roamInfo, roamId, eCSR_ROAM_FT_START, 
+    csrRoamCallCallback(pMac, pNeighborRoamInfo->csrSessionId, &roamInfo, roamId, eCSR_ROAM_FT_START,
                 eSIR_SME_SUCCESS);
 
     vos_mem_zero(&roamInfo, sizeof(tCsrRoamInfo));
     CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING)
-    
+
     csrNeighborRoamGetHandoffAPInfo(pMac, &handoffNode);
     VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
                FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR),
@@ -4694,27 +4694,27 @@ void csrNeighborRoamRequestHandoff(tpAniSirGlobal pMac)
     }
 #endif
 
-    /* Free the profile.. Just to make sure we dont leak memory here */ 
+    /* Free the profile.. Just to make sure we dont leak memory here */
     csrReleaseProfile(pMac, &pNeighborRoamInfo->csrNeighborRoamProfile);
     /* Create the Handoff AP profile. Copy the currently connected profile and update only the BSSID and channel number
         This should happen before issuing disconnect */
     csrRoamCopyConnectedProfile(pMac, pNeighborRoamInfo->csrSessionId, &pNeighborRoamInfo->csrNeighborRoamProfile);
     vos_mem_copy(pNeighborRoamInfo->csrNeighborRoamProfile.BSSIDs.bssid, handoffNode.pBssDescription->bssId, sizeof(tSirMacAddr));
     pNeighborRoamInfo->csrNeighborRoamProfile.ChannelInfo.ChannelList[0] = handoffNode.pBssDescription->channelId;
-    
+
     NEIGHBOR_ROAM_DEBUG(pMac, LOGW, " csrRoamHandoffRequested: disassociating with current AP");
 
     if(!HAL_STATUS_SUCCESS(csrRoamIssueDisassociateCmd(pMac, sessionId, eCSR_DISCONNECT_REASON_HANDOFF)))
     {
         smsLog(pMac, LOGW, "csrRoamHandoffRequested:  fail to issue disassociate");
         return;
-    }                       
+    }
 
     //notify HDD for handoff, providing the BSSID too
     roamInfo.reasonCode = eCsrRoamReasonBetterAP;
 
-    vos_mem_copy(roamInfo.bssid, 
-                 handoffNode.pBssDescription->bssId, 
+    vos_mem_copy(roamInfo.bssid,
+                 handoffNode.pBssDescription->bssId,
                  sizeof( tCsrBssid ));
 
     csrRoamCallCallback(pMac, sessionId, &roamInfo, 0, eCSR_ROAM_ROAMING_START, eCSR_ROAM_RESULT_NONE);
@@ -4727,7 +4727,7 @@ void csrNeighborRoamRequestHandoff(tpAniSirGlobal pMac)
 
     \fn csrNeighborRoamIsHandoffInProgress
 
-    \brief  This function returns whether handoff is in progress or not based on 
+    \brief  This function returns whether handoff is in progress or not based on
             the current neighbor roam state
 
     \param  pMac - The handle returned by macOpen.
@@ -4767,8 +4767,8 @@ tANI_BOOLEAN csrNeighborRoamIs11rAssoc(tpAniSirGlobal pMac)
 
     \fn csrNeighborRoamGetHandoffAPInfo
 
-    \brief  This function returns the best possible AP for handoff. For 11R case, it 
-            returns the 1st entry from pre-auth done list. For non-11r case, it returns 
+    \brief  This function returns the best possible AP for handoff. For 11R case, it
+            returns the 1st entry from pre-auth done list. For non-11r case, it returns
             the 1st entry from roamable AP list
 
     \param  pMac - The handle returned by macOpen.
@@ -4781,7 +4781,7 @@ void csrNeighborRoamGetHandoffAPInfo(tpAniSirGlobal pMac, tpCsrNeighborRoamBSSIn
 {
     tpCsrNeighborRoamControlInfo    pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
     tpCsrNeighborRoamBSSInfo        pBssNode;
-    
+
    if (NULL == pHandoffNode)
    {
       VOS_ASSERT(NULL != pHandoffNode);
@@ -4824,7 +4824,7 @@ void csrNeighborRoamGetHandoffAPInfo(tpAniSirGlobal pMac, tpCsrNeighborRoamBSSIn
 }
 
 /* ---------------------------------------------------------------------------
-    \brief  This function returns TRUE if preauth is completed 
+    \brief  This function returns TRUE if preauth is completed
 
     \param  pMac - The handle returned by macOpen.
 
@@ -4833,18 +4833,18 @@ void csrNeighborRoamGetHandoffAPInfo(tpAniSirGlobal pMac, tpCsrNeighborRoamBSSIn
 ---------------------------------------------------------------------------*/
 tANI_BOOLEAN csrNeighborRoamStatePreauthDone(tpAniSirGlobal pMac)
 {
-    return (pMac->roam.neighborRoamInfo.neighborRoamState == 
+    return (pMac->roam.neighborRoamInfo.neighborRoamState ==
                eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE);
 }
 
 /* ---------------------------------------------------------------------------
     \brief  In the event that we are associated with AP1 and we have
     completed pre auth with AP2. Then we receive a deauth/disassoc from
-    AP1. 
+    AP1.
     At this point neighbor roam is in pre auth done state, pre auth timer
     is running. We now handle this case by stopping timer and clearing
     the pre-auth state. We basically clear up and just go to disconnected
-    state. 
+    state.
 
     \param  pMac - The handle returned by macOpen.
 
@@ -4853,7 +4853,7 @@ tANI_BOOLEAN csrNeighborRoamStatePreauthDone(tpAniSirGlobal pMac)
 void csrNeighborRoamTranistionPreauthDoneToDisconnected(tpAniSirGlobal pMac)
 {
     tpCsrNeighborRoamControlInfo    pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
-    if (pMac->roam.neighborRoamInfo.neighborRoamState != 
+    if (pMac->roam.neighborRoamInfo.neighborRoamState !=
                eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE) return;
 
     // Stop timer
diff --git a/CORE/SME/src/csr/csrTdlsProcess.c b/CORE/SME/src/csr/csrTdlsProcess.c
index c313062e7c02..86c28ac9c697 100644
--- a/CORE/SME/src/csr/csrTdlsProcess.c
+++ b/CORE/SME/src/csr/csrTdlsProcess.c
@@ -25,12 +25,12 @@
  * to the Linux Foundation.
  */
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
+
 
-  
     \file csrTdlsProcess.c
-  
+
     Implementation for the TDLS interface to PE.
 ========================================================================== */
 
@@ -53,7 +53,7 @@
 
 #ifdef FEATURE_WLAN_TDLS_INTERNAL
 /*
- * initialize Discovery list 
+ * initialize Discovery list
  */
 eHalStatus csrTdlsInitPeerList(tpAniSirGlobal pMac )
 {
@@ -80,7 +80,7 @@ eHalStatus csrTdlsRemoveSmeCmd(tpAniSirGlobal pMac, eSmeCommandType cmdType)
         pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link);
         if( cmdType == pCommand->command )
         {
-            if( csrLLRemoveEntry( &pMac->sme.smeCmdActiveList, 
+            if( csrLLRemoveEntry( &pMac->sme.smeCmdActiveList,
                                              pEntry, LL_ACCESS_LOCK ) )
             {
                 vos_mem_zero( &pCommand->u.tdlsCmd, sizeof( tTdlsCmd ) );
@@ -92,9 +92,9 @@ eHalStatus csrTdlsRemoveSmeCmd(tpAniSirGlobal pMac, eSmeCommandType cmdType)
     }
     return status ;
 }
-    
+
 /*
- * TDLS request API, called from HDD to send a TDLS frame 
+ * TDLS request API, called from HDD to send a TDLS frame
  * in SME/CSR and send message to PE to trigger TDLS discovery procedure.
  */
 eHalStatus csrTdlsSendMgmtReq(tHalHandle hHal, tANI_U8 sessionId, tCsrTdlsSendMgmt *tdlsSendMgmt)
@@ -102,9 +102,9 @@ eHalStatus csrTdlsSendMgmtReq(tHalHandle hHal, tANI_U8 sessionId, tCsrTdlsSendMg
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
     tSmeCmd *tdlsSendMgmtCmd ;
     eHalStatus status = eHAL_STATUS_FAILURE ;
- 
+
     //If connected and in Infra. Only then allow this
-    if( CSR_IS_SESSION_VALID( pMac, sessionId ) && 
+    if( CSR_IS_SESSION_VALID( pMac, sessionId ) &&
         csrIsConnStateConnectedInfra( pMac, sessionId ) &&
         (NULL != tdlsSendMgmt) )
     {
@@ -112,17 +112,17 @@ eHalStatus csrTdlsSendMgmtReq(tHalHandle hHal, tANI_U8 sessionId, tCsrTdlsSendMg
 
         if(tdlsSendMgmtCmd)
         {
-            tTdlsSendMgmtCmdInfo *tdlsSendMgmtCmdInfo = 
+            tTdlsSendMgmtCmdInfo *tdlsSendMgmtCmdInfo =
                             &tdlsSendMgmtCmd->u.tdlsCmd.u.tdlsSendMgmtCmdInfo ;
 
             tdlsSendMgmtCmd->sessionId = sessionId;
 
-            tdlsSendMgmtCmdInfo->frameType = tdlsSendMgmt->frameType ;   
-            tdlsSendMgmtCmdInfo->dialog = tdlsSendMgmt->dialog ;   
+            tdlsSendMgmtCmdInfo->frameType = tdlsSendMgmt->frameType ;
+            tdlsSendMgmtCmdInfo->dialog = tdlsSendMgmt->dialog ;
             tdlsSendMgmtCmdInfo->statusCode = tdlsSendMgmt->statusCode ;
             tdlsSendMgmtCmdInfo->responder = tdlsSendMgmt->responder;
             vos_mem_copy(tdlsSendMgmtCmdInfo->peerMac,
-                                   tdlsSendMgmt->peerMac, sizeof(tSirMacAddr)) ; 
+                                   tdlsSendMgmt->peerMac, sizeof(tSirMacAddr)) ;
 
             if( (0 != tdlsSendMgmt->len) && (NULL != tdlsSendMgmt->buf) )
             {
@@ -158,7 +158,7 @@ eHalStatus csrTdlsSendMgmtReq(tHalHandle hHal, tANI_U8 sessionId, tCsrTdlsSendMg
 }
 
 /*
- * TDLS request API, called from HDD to add a TDLS peer 
+ * TDLS request API, called from HDD to add a TDLS peer
  */
 eHalStatus csrTdlsChangePeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac,
                                 tCsrStaParams *pstaParams)
@@ -271,9 +271,9 @@ eHalStatus csrTdlsAddPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr pee
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
     tSmeCmd *tdlsAddStaCmd ;
     eHalStatus status = eHAL_STATUS_FAILURE ;
- 
+
     //If connected and in Infra. Only then allow this
-    if( CSR_IS_SESSION_VALID( pMac, sessionId ) && 
+    if( CSR_IS_SESSION_VALID( pMac, sessionId ) &&
         csrIsConnStateConnectedInfra( pMac, sessionId ) &&
         (NULL != peerMac) )
     {
@@ -281,14 +281,14 @@ eHalStatus csrTdlsAddPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr pee
 
         if(tdlsAddStaCmd)
         {
-            tTdlsAddStaCmdInfo *tdlsAddStaCmdInfo = 
+            tTdlsAddStaCmdInfo *tdlsAddStaCmdInfo =
                 &tdlsAddStaCmd->u.tdlsCmd.u.tdlsAddStaCmdInfo ;
 
             tdlsAddStaCmd->sessionId = sessionId;
             tdlsAddStaCmdInfo->tdlsAddOper = TDLS_OPER_ADD;
 
             vos_mem_copy( tdlsAddStaCmdInfo->peerMac,
-                    peerMac, sizeof(tSirMacAddr)) ; 
+                    peerMac, sizeof(tSirMacAddr)) ;
 
             tdlsAddStaCmd->command = eSmeCommandTdlsAddPeer ;
             tdlsAddStaCmd->u.tdlsCmd.size = sizeof(tTdlsAddStaCmdInfo) ;
@@ -308,9 +308,9 @@ eHalStatus csrTdlsDelPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr pee
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
     tSmeCmd *tdlsDelStaCmd ;
     eHalStatus status = eHAL_STATUS_FAILURE ;
- 
+
     //If connected and in Infra. Only then allow this
-    if( CSR_IS_SESSION_VALID( pMac, sessionId ) && 
+    if( CSR_IS_SESSION_VALID( pMac, sessionId ) &&
         csrIsConnStateConnectedInfra( pMac, sessionId ) &&
         (NULL != peerMac) )
     {
@@ -318,13 +318,13 @@ eHalStatus csrTdlsDelPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr pee
 
         if(tdlsDelStaCmd)
         {
-            tTdlsDelStaCmdInfo *tdlsDelStaCmdInfo = 
+            tTdlsDelStaCmdInfo *tdlsDelStaCmdInfo =
                             &tdlsDelStaCmd->u.tdlsCmd.u.tdlsDelStaCmdInfo ;
 
             tdlsDelStaCmd->sessionId = sessionId;
 
             vos_mem_copy(tdlsDelStaCmdInfo->peerMac,
-                                   peerMac, sizeof(tSirMacAddr)) ; 
+                                   peerMac, sizeof(tSirMacAddr)) ;
 
             tdlsDelStaCmd->command = eSmeCommandTdlsDelPeer ;
             tdlsDelStaCmd->u.tdlsCmd.size = sizeof(tTdlsDelStaCmdInfo) ;
@@ -345,21 +345,21 @@ eHalStatus csrTdlsDiscoveryReq(tHalHandle hHal, tANI_U8 sessionId, tCsrTdlsDisRe
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
     tSmeCmd *tdlsDisReqCmd ;
     eHalStatus status = eHAL_STATUS_FAILURE ;
- 
+
     if(tdlsDisReq)
     {
         tdlsDisReqCmd = csrGetCommandBuffer(pMac) ;
 
         if(tdlsDisReqCmd)
         {
-            tTdlsDisReqCmdinfo *disReqCmdInfo = 
+            tTdlsDisReqCmdinfo *disReqCmdInfo =
                             &tdlsDisReqCmd->u.tdlsCmd.u.tdlsDisReqCmdInfo ;
 
             tdlsDisReqCmd->sessionId = sessionId;
 
-            disReqCmdInfo->tdlsDisType = tdlsDisReq->disType ;   
+            disReqCmdInfo->tdlsDisType = tdlsDisReq->disType ;
             vos_mem_copy(disReqCmdInfo->peerMac,
-                                   tdlsDisReq->peerMac, sizeof(tSirMacAddr)) ; 
+                                   tdlsDisReq->peerMac, sizeof(tSirMacAddr)) ;
             tdlsDisReqCmd->command = eSmeCommandTdlsDiscovery ;
             tdlsDisReqCmd->u.tdlsCmd.size = sizeof(tTdlsDisReqCmdinfo) ;
             smePushCommand(pMac, tdlsDisReqCmd, FALSE) ;
@@ -379,20 +379,20 @@ eHalStatus csrTdlsSetupReq(tHalHandle hHal, tANI_U8 sessionId, tCsrTdlsSetupRequ
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
     tSmeCmd *tdlsSetupReqCmd ;
     eHalStatus status = eHAL_STATUS_FAILURE ;
- 
+
     if(tdlsSetupReq)
     {
         tdlsSetupReqCmd = csrGetCommandBuffer(pMac) ;
 
         if(tdlsSetupReqCmd)
         {
-           tTdlsLinkSetupReqCmdinfo *setupCmdInfo = 
+           tTdlsLinkSetupReqCmdinfo *setupCmdInfo =
                         &tdlsSetupReqCmd->u.tdlsCmd.u.tdlsLinkSetupReqCmdInfo ;
 
             tdlsSetupReqCmd->sessionId = sessionId;
 
             vos_mem_copy(setupCmdInfo->peerMac,
-                                tdlsSetupReq->peerMac, sizeof(tSirMacAddr)) ; 
+                                tdlsSetupReq->peerMac, sizeof(tSirMacAddr)) ;
             tdlsSetupReqCmd->command = eSmeCommandTdlsLinkSetup ;
             tdlsSetupReqCmd->u.tdlsCmd.size = sizeof(tTdlsLinkSetupReqCmdinfo) ;
             smePushCommand(pMac, tdlsSetupReqCmd, FALSE) ;
@@ -406,28 +406,28 @@ eHalStatus csrTdlsSetupReq(tHalHandle hHal, tANI_U8 sessionId, tCsrTdlsSetupRequ
  * TDLS request API, called from HDD to enable TDLS link teardown request
  * in SME/CSR and send message to PE to trigger TDLS link teardown procedure.
  */
-eHalStatus csrTdlsTeardownReq(tHalHandle hHal, tANI_U8 sessionId, 
+eHalStatus csrTdlsTeardownReq(tHalHandle hHal, tANI_U8 sessionId,
                                  tCsrTdlsTeardownRequest *tdlsTeardownReq)
 {
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
     tSmeCmd *tdlsTeardownReqCmd ;
     eHalStatus status = eHAL_STATUS_FAILURE ;
- 
+
     if(tdlsTeardownReq)
     {
         tdlsTeardownReqCmd = csrGetCommandBuffer(pMac) ;
-        
+
         if(tdlsTeardownReqCmd)
         {
-            tTdlsLinkTeardownCmdinfo *teardownCmdInfo = 
+            tTdlsLinkTeardownCmdinfo *teardownCmdInfo =
                    &tdlsTeardownReqCmd->u.tdlsCmd.u.tdlsLinkTeardownCmdInfo ;
 
             tdlsTeardownReqCmd->sessionId = sessionId;
 
             vos_mem_copy(teardownCmdInfo->peerMac,
-                         tdlsTeardownReq->peerMac, sizeof(tSirMacAddr)) ; 
+                         tdlsTeardownReq->peerMac, sizeof(tSirMacAddr)) ;
             tdlsTeardownReqCmd->command = eSmeCommandTdlsLinkTear ;
-            tdlsTeardownReqCmd->u.tdlsCmd.size = 
+            tdlsTeardownReqCmd->u.tdlsCmd.size =
                                         sizeof(tTdlsLinkTeardownCmdinfo) ;
             smePushCommand(pMac, tdlsTeardownReqCmd, FALSE) ;
             status = eHAL_STATUS_SUCCESS ;
@@ -442,7 +442,7 @@ eHalStatus csrTdlsTeardownReq(tHalHandle hHal, tANI_U8 sessionId,
 /*
  * TDLS messages sent to PE .
  */
-eHalStatus tdlsSendMessage(tpAniSirGlobal pMac, tANI_U16 msg_type, 
+eHalStatus tdlsSendMessage(tpAniSirGlobal pMac, tANI_U16 msg_type,
                               void *msg_data, tANI_U32 msg_size)
 {
 
@@ -495,7 +495,7 @@ eHalStatus csrTdlsProcessSendMgmt( tpAniSirGlobal pMac, tSmeCmd *cmd )
     }
     tdlsSendMgmtReq->sessionId = cmd->sessionId;
     //Using dialog as transactionId. This can be used to match response with request
-    tdlsSendMgmtReq->transactionId = tdlsSendMgmtCmdInfo->dialog;  
+    tdlsSendMgmtReq->transactionId = tdlsSendMgmtCmdInfo->dialog;
     tdlsSendMgmtReq->reqType =  tdlsSendMgmtCmdInfo->frameType ;
     tdlsSendMgmtReq->dialog =  tdlsSendMgmtCmdInfo->dialog ;
     tdlsSendMgmtReq->statusCode =  tdlsSendMgmtCmdInfo->statusCode ;
@@ -515,7 +515,7 @@ eHalStatus csrTdlsProcessSendMgmt( tpAniSirGlobal pMac, tSmeCmd *cmd )
     }
     // Send the request to PE.
     smsLog( pMac, LOG1, "sending TDLS Mgmt Frame req to PE " );
-    status = tdlsSendMessage(pMac, eWNI_SME_TDLS_SEND_MGMT_REQ, 
+    status = tdlsSendMessage(pMac, eWNI_SME_TDLS_SEND_MGMT_REQ,
             (void *)tdlsSendMgmtReq , sizeof(tSirTdlsSendMgmtReq)+tdlsSendMgmtCmdInfo->len) ;
     if(!HAL_STATUS_SUCCESS( status ) )
     {
@@ -592,7 +592,7 @@ eHalStatus csrTdlsProcessAddSta( tpAniSirGlobal pMac, tSmeCmd *cmd )
 
     // Send the request to PE.
     smsLog( pMac, LOGE, "sending TDLS Add Sta req to PE " );
-    status = tdlsSendMessage(pMac, eWNI_SME_TDLS_ADD_STA_REQ, 
+    status = tdlsSendMessage(pMac, eWNI_SME_TDLS_ADD_STA_REQ,
             (void *)tdlsAddStaReq , sizeof(tSirTdlsAddStaReq)) ;
     if(!HAL_STATUS_SUCCESS( status ) )
     {
@@ -651,7 +651,7 @@ eHalStatus csrTdlsProcessDelSta( tpAniSirGlobal pMac, tSmeCmd *cmd )
 #endif
         "sending TDLS Del Sta "MAC_ADDRESS_STR" req to PE",
          MAC_ADDR_ARRAY(tdlsDelStaCmdInfo->peerMac));
-    status = tdlsSendMessage(pMac, eWNI_SME_TDLS_DEL_STA_REQ, 
+    status = tdlsSendMessage(pMac, eWNI_SME_TDLS_DEL_STA_REQ,
             (void *)tdlsDelStaReq , sizeof(tSirTdlsDelStaReq)) ;
     if(!HAL_STATUS_SUCCESS( status ) )
     {
@@ -689,7 +689,7 @@ eHalStatus csrTdlsProcessCmd(tpAniSirGlobal pMac, tSmeCmd *cmd)
             }
         }
         break;
-        case eSmeCommandTdlsDelPeer: 
+        case eSmeCommandTdlsDelPeer:
         {
             status = csrTdlsProcessDelSta( pMac, cmd );
             if(HAL_STATUS_SUCCESS( status ) )
@@ -713,7 +713,7 @@ eHalStatus csrTdlsProcessCmd(tpAniSirGlobal pMac, tSmeCmd *cmd)
             tTdlsDisReqCmdinfo *disReqCmdInfo = &tdlsCmd.u.tdlsDisReqCmdInfo ;
             tSirTdlsDisReq *disReq = NULL ;
             tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, cmd->sessionId );
-            
+
             disReq = vos_mem_malloc(sizeof(tSirTdlsDisReq));
             if ( NULL == disReq )
                 status = eHAL_STATUS_FAILURE;
@@ -734,7 +734,7 @@ eHalStatus csrTdlsProcessCmd(tpAniSirGlobal pMac, tSmeCmd *cmd)
             vos_mem_copy( disReq->peerMac,
                                  disReqCmdInfo->peerMac, sizeof(tSirMacAddr)) ;
             smsLog( pMac, LOGE, "sending TDLS discovery to PE " );
-            status = tdlsSendMessage(pMac, eWNI_SME_TDLS_DISCOVERY_START_REQ, 
+            status = tdlsSendMessage(pMac, eWNI_SME_TDLS_DISCOVERY_START_REQ,
                           (void *)disReq , sizeof(tSirTdlsDisReq)) ;
             if(HAL_STATUS_SUCCESS( status ) )
             {
@@ -746,8 +746,8 @@ eHalStatus csrTdlsProcessCmd(tpAniSirGlobal pMac, tSmeCmd *cmd)
         }
         case eSmeCommandTdlsLinkSetup:
         {
-            tTdlsLinkSetupReqCmdinfo *linkSetupReqCmdInfo = 
-                                         &tdlsCmd.u.tdlsLinkSetupReqCmdInfo ;   
+            tTdlsLinkSetupReqCmdinfo *linkSetupReqCmdInfo =
+                                         &tdlsCmd.u.tdlsLinkSetupReqCmdInfo ;
             tSirTdlsSetupReq *setupReq = NULL ;
             tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, cmd->sessionId );
 
@@ -766,15 +766,15 @@ eHalStatus csrTdlsProcessCmd(tpAniSirGlobal pMac, tSmeCmd *cmd)
             }
             setupReq->sessionId = cmd->sessionId;
             setupReq->transactionId = 0;  /* TODO ? */
-            
+
             vos_mem_copy( setupReq->bssid, pSession->pConnectBssDesc->bssId,
                                  sizeof (tSirMacAddr));
             vos_mem_copy( setupReq->peerMac,
                            linkSetupReqCmdInfo->peerMac, sizeof(tSirMacAddr)) ;
-    
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                              ("sending TDLS link setup to PE "));
-            status = tdlsSendMessage(pMac, eWNI_SME_TDLS_LINK_START_REQ,    
+            status = tdlsSendMessage(pMac, eWNI_SME_TDLS_LINK_START_REQ,
                           (void *)setupReq , sizeof(tSirTdlsSetupReq) ) ;
 
             if(HAL_STATUS_SUCCESS( status ) )
@@ -786,7 +786,7 @@ eHalStatus csrTdlsProcessCmd(tpAniSirGlobal pMac, tSmeCmd *cmd)
         }
         case eSmeCommandTdlsLinkTear:
         {
-            tTdlsLinkTeardownCmdinfo *linkTeardownCmdInfo = 
+            tTdlsLinkTeardownCmdinfo *linkTeardownCmdInfo =
                                         &tdlsCmd.u.tdlsLinkTeardownCmdInfo ;
             tSirTdlsTeardownReq *teardownReq = NULL ;
             tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, cmd->sessionId );
@@ -810,7 +810,7 @@ eHalStatus csrTdlsProcessCmd(tpAniSirGlobal pMac, tSmeCmd *cmd)
                                  sizeof (tSirMacAddr));
             vos_mem_copy( &teardownReq->peerMac,
                            linkTeardownCmdInfo->peerMac, sizeof(tSirMacAddr)) ;
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                                                 ("teardown request..")) ;
             status = tdlsSendMessage(pMac, eWNI_SME_TDLS_TEARDOWN_REQ,
                           (void *)teardownReq , sizeof(tSirTdlsTeardownReq)) ;
@@ -825,12 +825,12 @@ eHalStatus csrTdlsProcessCmd(tpAniSirGlobal pMac, tSmeCmd *cmd)
 #endif
        default:
        {
-            /* TODO: Add defualt handling */  
+            /* TODO: Add defualt handling */
            break ;
-       } 
-             
+       }
+
     }
-    return status ; 
+    return status ;
 }
 
 eHalStatus csrTdlsProcessLinkEstablish( tpAniSirGlobal pMac, tSmeCmd *cmd )
@@ -883,20 +883,20 @@ eHalStatus csrTdlsProcessLinkEstablish( tpAniSirGlobal pMac, tSmeCmd *cmd )
 /*
  * Find specific TDLS peer (based on peer MAC address).
  */
-tCsrTdlsPeerLinkinfo *findTdlsPeer(tpAniSirGlobal pMac, 
+tCsrTdlsPeerLinkinfo *findTdlsPeer(tpAniSirGlobal pMac,
                                 tDblLinkList *peerList, tSirMacAddr peerMac)
 {
     tListElem *pEntry = NULL ;
-    tCsrTdlsPeerLinkinfo *peerLinkInfo = NULL ; 
+    tCsrTdlsPeerLinkinfo *peerLinkInfo = NULL ;
     tSirTdlsPeerInfo *peerInfo = NULL ;
 
     pEntry = csrLLPeekHead( peerList, LL_ACCESS_LOCK );
     while(pEntry)
     {
-        peerLinkInfo = GET_BASE_ADDR( pEntry, tCsrTdlsPeerLinkinfo, 
+        peerLinkInfo = GET_BASE_ADDR( pEntry, tCsrTdlsPeerLinkinfo,
                                                         tdlsPeerStaLink) ;
         peerInfo = &peerLinkInfo->tdlsDisPeerInfo ;
- 
+
         if ( vos_mem_compare( (tANI_U8 *)peerInfo->peerMac,
                               (tANI_U8 *) peerMac, sizeof(tSirMacAddr)) )
         {
@@ -905,8 +905,8 @@ tCsrTdlsPeerLinkinfo *findTdlsPeer(tpAniSirGlobal pMac,
 
         pEntry = csrLLNext( peerList, pEntry, LL_ACCESS_LOCK) ;
     }
- 
-    return ((pEntry) ? peerLinkInfo: NULL) ; 
+
+    return ((pEntry) ? peerLinkInfo: NULL) ;
 }
 /*
  * Delete TDLD peer info, called from TDLS teardown request.
@@ -915,11 +915,11 @@ static eHalStatus tdlsDeleteTdlsPeerInfo(tpAniSirGlobal pMac,
                                               tSirMacAddr peerMac)
 {
     tCsrTdlsCtxStruct *disInfo = &pMac->tdlsCtx ;
-    tCsrTdlsPeerLinkinfo *peerInfo = 
+    tCsrTdlsPeerLinkinfo *peerInfo =
                findTdlsPeer(pMac, &disInfo->tdlsPotentialPeerList, peerMac) ;
     eHalStatus status = eHAL_STATUS_FAILURE ;
 
-    if((csrLLRemoveEntry(&disInfo->tdlsPotentialPeerList, 
+    if((csrLLRemoveEntry(&disInfo->tdlsPotentialPeerList,
                         &peerInfo->tdlsPeerStaLink, LL_ACCESS_NOLOCK)))
     {
        vos_mem_free((void *)peerInfo) ;
@@ -927,7 +927,7 @@ static eHalStatus tdlsDeleteTdlsPeerInfo(tpAniSirGlobal pMac,
 
     }
 
-    return status ; 
+    return status ;
 }
 
 /*
@@ -938,20 +938,20 @@ static eHalStatus tdlsUpdateTdlsPeerState(tpAniSirGlobal pMac,
                                           tSirMacAddr peerMac,tANI_U8 state )
 {
     tCsrTdlsCtxStruct *disInfo = &pMac->tdlsCtx ;
-    tCsrTdlsPeerLinkinfo *peerLinkInfo = 
+    tCsrTdlsPeerLinkinfo *peerLinkInfo =
                 findTdlsPeer(pMac, &disInfo->tdlsPotentialPeerList, peerMac) ;
     eHalStatus status = eHAL_STATUS_FAILURE ;
 
     if(peerLinkInfo)
     {
         tSirTdlsPeerInfo *peerInfo = &peerLinkInfo->tdlsDisPeerInfo ;
-        peerInfo->tdlsPeerState = state ;  
+        peerInfo->tdlsPeerState = state ;
         status = eHAL_STATUS_SUCCESS ;
     }
     else
     {
         /* TODO: update this peer found in link setup in peer list */
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                        ("This TDLS client is not in discovery list ") );
         status = eHAL_STATUS_SUCCESS ;
     }
@@ -963,16 +963,16 @@ static eHalStatus tdlsUpdateTdlsPeerState(tpAniSirGlobal pMac,
  * save TDLS peer info, this will be called after successfull completion
  * of TDLS discovery procedure.
  */
-static eHalStatus tdlsSaveTdlsPeerInfo(tpAniSirGlobal pMac, 
+static eHalStatus tdlsSaveTdlsPeerInfo(tpAniSirGlobal pMac,
                                           tSirTdlsPeerInfo *disPeerInfo)
 {
-    tCsrTdlsPeerLinkinfo *peerInfo = NULL ; 
+    tCsrTdlsPeerLinkinfo *peerInfo = NULL ;
     tCsrTdlsCtxStruct *disInfo = &pMac->tdlsCtx ;
     eHalStatus status = eHAL_STATUS_FAILURE ;
-    /* 
+    /*
      * Ok, allocate memory for peer info here
      * we allocate memory for each peer here and free his memory
-     * at the time the peer node is getting deleted, possible case is 
+     * at the time the peer node is getting deleted, possible case is
      * teardown
      */
     peerInfo = vos_mem_malloc(sizeof(tCsrTdlsPeerLinkinfo));
@@ -981,10 +981,10 @@ static eHalStatus tdlsSaveTdlsPeerInfo(tpAniSirGlobal pMac,
     else
         status = eHAL_STATUS_SUCCESS;
 
-    /* 
+    /*
      * go ahead and copy peerInfo and insert this node info discovery rsp
      * database.
-     */ 
+     */
     if (HAL_STATUS_SUCCESS(status))
     {
         vos_mem_set( &peerInfo->tdlsDisPeerInfo,
@@ -1001,7 +1001,7 @@ static eHalStatus tdlsSaveTdlsPeerInfo(tpAniSirGlobal pMac,
         /*
          * finally insert this tdls peer info into tdls potential peer list
          */
-        csrLLInsertTail( &disInfo->tdlsPotentialPeerList, 
+        csrLLInsertTail( &disInfo->tdlsPotentialPeerList,
                                  &peerInfo->tdlsPeerStaLink, LL_ACCESS_LOCK );
     }
 
@@ -1044,7 +1044,7 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac,  v_U16_t msgType,
                 roamResult = eCSR_ROAM_RESULT_ADD_TDLS_PEER;
             else /* addStaRsp->tdlsAddOper must be TDLS_OPER_UPDATE */
                 roamResult = eCSR_ROAM_RESULT_UPDATE_TDLS_PEER;
-            csrRoamCallCallback(pMac, addStaRsp->sessionId, &roamInfo, 0, 
+            csrRoamCallCallback(pMac, addStaRsp->sessionId, &roamInfo, 0,
                                 eCSR_ROAM_TDLS_STATUS_UPDATE,
                                 roamResult);
 
@@ -1064,8 +1064,8 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac,  v_U16_t msgType,
              * register peer with TL, we have to go through HDD as this is
              * the only way to register any STA with TL.
              */
-            csrRoamCallCallback(pMac, delStaRsp->sessionId, &roamInfo, 0, 
-                         eCSR_ROAM_TDLS_STATUS_UPDATE, 
+            csrRoamCallCallback(pMac, delStaRsp->sessionId, &roamInfo, 0,
+                         eCSR_ROAM_TDLS_STATUS_UPDATE,
                                eCSR_ROAM_RESULT_DELETE_TDLS_PEER);
 
             csrTdlsRemoveSmeCmd(pMac, eSmeCommandTdlsDelPeer) ;
@@ -1137,19 +1137,19 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac,  v_U16_t msgType,
                 tANI_U16  disStaCount = disRsp->numDisSta ;
                 tCsrTdlsPeerLinkinfo *peerLinkInfo = NULL ;
                 tANI_U8 i = 0 ;
-  
-                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+
+                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                 ("DIS START RSP/IND recieved sta count = %d"), disStaCount) ;
                 for( ; i < disStaCount ; i++)
                 {
                     tSirTdlsPeerInfo *peerInfo = &disRsp->tdlsDisPeerInfo[i] ;
-                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                               ("SME, peer MAC: "MAC_ADDRESS_STR),
                                MAC_ADDR_ARRAY(peerInfo->peerMac));
 
                     peerLinkInfo = findTdlsPeer(pMac,
                                    &disInfo->tdlsPotentialPeerList,
-                                                     peerInfo->peerMac) ; 
+                                                     peerInfo->peerMac) ;
 
                     if(NULL == peerLinkInfo)
                     {
@@ -1159,8 +1159,8 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac,  v_U16_t msgType,
                     else
                     {
                         /* update RSSI of existing peer */
-                        tSirTdlsPeerInfo *newPeerInfo = 
-                                            &peerLinkInfo->tdlsDisPeerInfo ; 
+                        tSirTdlsPeerInfo *newPeerInfo =
+                                            &peerLinkInfo->tdlsDisPeerInfo ;
                         newPeerInfo->tdlsPeerRssi = peerInfo->tdlsPeerRssi ;
                     }
                 }
@@ -1175,8 +1175,8 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac,  v_U16_t msgType,
                 smsLog( pMac, LOGW, "there is no tdls client discovered .." );
             }
             /* Now free the memory for this message */
-            break ;    
-        }    
+            break ;
+        }
         case eWNI_SME_TDLS_LINK_START_RSP:
         {
             /* remove pending eSmeCommandTdlsLinkSetup command */
@@ -1185,28 +1185,28 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac,  v_U16_t msgType,
         /* fall through .. */
         case eWNI_SME_TDLS_LINK_START_IND:
         {
-            tSirTdlsLinksetupRsp *linkSetupRsp = 
+            tSirTdlsLinksetupRsp *linkSetupRsp =
                                         (tSirTdlsLinksetupRsp *) pMsgBuf ;
 
             if(eSIR_SME_SUCCESS == linkSetupRsp->statusCode)
             {
-                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                       ("Link setup for Peer "MAC_ADDRESS_STR),
                                  MAC_ADDR_ARRAY(linkSetupRsp->peerMac));
-       
-                tdlsUpdateTdlsPeerState(pMac, linkSetupRsp->peerMac, 
+
+                tdlsUpdateTdlsPeerState(pMac, linkSetupRsp->peerMac,
                                                   TDLS_LINK_SETUP_STATE) ;
             }
             else
             {
                 smsLog( pMac, LOGW, "failure receieved in link setup .." );
             }
-            break ;       
+            break ;
         }
 
         case eWNI_SME_TDLS_TEARDOWN_RSP:
         {
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                                           ("TEARDOWN RSP from PE ")) ;
             /* remove pending eSmeCommandTdlsLinkTear command */
             csrTdlsRemoveSmeCmd(pMac, eSmeCommandTdlsLinkTear) ;
@@ -1214,19 +1214,19 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac,  v_U16_t msgType,
         /* fall through .. */
         case eWNI_SME_TDLS_TEARDOWN_IND:
         {
-            tSirTdlsTeardownRsp *linkTearRsp = 
+            tSirTdlsTeardownRsp *linkTearRsp =
                                         (tSirTdlsTeardownRsp *) pMsgBuf ;
             if(eSIR_SME_SUCCESS == linkTearRsp->statusCode)
             {
-            
-                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+
+                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                  ("Teardown peer MAC = "MAC_ADDRESS_STR),
                             MAC_ADDR_ARRAY(linkTearRsp->peerMac));
                 tdlsDeleteTdlsPeerInfo(pMac, linkTearRsp->peerMac) ;
             }
             else
             {
-                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+                VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                                    ("failure receieved in Teardown .." ));
             }
             break ;
@@ -1243,11 +1243,11 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac,  v_U16_t msgType,
              * register peer with TL, we have to go through HDD as this is
              * the only way to register any STA with TL.
              */
-            csrRoamCallCallback(pMac, peerInd->sessionId, &roamInfo, 0, 
-                         eCSR_ROAM_TDLS_STATUS_UPDATE, 
+            csrRoamCallCallback(pMac, peerInd->sessionId, &roamInfo, 0,
+                         eCSR_ROAM_TDLS_STATUS_UPDATE,
                                eCSR_ROAM_RESULT_ADD_TDLS_PEER);
             break ;
- 
+
         }
         case eWNI_SME_DELETE_TDLS_PEER_IND:
         {
@@ -1259,8 +1259,8 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac,  v_U16_t msgType,
              * register peer with TL, we have to go through HDD as this is
              * the only way to register any STA with TL.
              */
-            csrRoamCallCallback(pMac, peerInd->sessionId, &roamInfo, 0, 
-                         eCSR_ROAM_TDLS_STATUS_UPDATE, 
+            csrRoamCallCallback(pMac, peerInd->sessionId, &roamInfo, 0,
+                         eCSR_ROAM_TDLS_STATUS_UPDATE,
                                eCSR_ROAM_RESULT_DELETE_TDLS_PEER);
             break ;
 
@@ -1318,7 +1318,7 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac,  v_U16_t msgType,
             break ;
         }
     }
-    
+
     return eHAL_STATUS_SUCCESS ;
 }
 #endif
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 77db26419421..87c0f4cddcf5 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -401,7 +401,7 @@ static tCsrCountryInfo gCsrCountryInfo[eCSR_NUM_COUNTRY_INDEX] =
     {REG_DOMAIN_HI_5GHZ, {'C', 'N', ' '}},   //CHINA
     {REG_DOMAIN_WORLD, {'C', 'O', ' '}},       //COLOMBIA
     {REG_DOMAIN_WORLD, {'C', 'R', ' '}},       //COSTA RICA
-    {REG_DOMAIN_WORLD, {'C', 'U', ' '}},     //CUBA  
+    {REG_DOMAIN_WORLD, {'C', 'U', ' '}},     //CUBA
     {REG_DOMAIN_WORLD, {'C', 'V', ' '}},     //CAPE VERDE
     {REG_DOMAIN_WORLD, {'C', 'X', ' '}},     //CHRISTMAS ISLAND
     {REG_DOMAIN_WORLD, {'C', 'Y', ' '}},      //CYPRUS
@@ -451,7 +451,7 @@ static tCsrCountryInfo gCsrCountryInfo[eCSR_NUM_COUNTRY_INDEX] =
     {REG_DOMAIN_WORLD, {'H', 'T', ' '}},     //HAITI
     {REG_DOMAIN_HI_5GHZ, {'H', 'U', ' '}},      //HUNGARY
     {REG_DOMAIN_APAC, {'I', 'D', ' '}},     //INDONESIA
-    {REG_DOMAIN_ETSI, {'I', 'E', ' '}},     //IRELAND        
+    {REG_DOMAIN_ETSI, {'I', 'E', ' '}},     //IRELAND
     {REG_DOMAIN_WORLD, {'I', 'L', ' '}},        //ISREAL
     {REG_DOMAIN_ETSI, {'I', 'M', ' '}},      //ISLE OF MAN
     {REG_DOMAIN_WORLD, {'I', 'N', ' '}},      //INDIA
@@ -471,7 +471,7 @@ static tCsrCountryInfo gCsrCountryInfo[eCSR_NUM_COUNTRY_INDEX] =
     {REG_DOMAIN_WORLD, {'K', 'M', ' '}},     //COMOROS
     {REG_DOMAIN_WORLD, {'K', 'N', ' '}},     //SAINT KITTS AND NEVIS
     {REG_DOMAIN_KOREA, {'K', 'P', ' '}},     //KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF
-    {REG_DOMAIN_KOREA, {'K', 'R', ' '}},     //KOREA, REPUBLIC OF 
+    {REG_DOMAIN_KOREA, {'K', 'R', ' '}},     //KOREA, REPUBLIC OF
     {REG_DOMAIN_WORLD, {'K', 'W', ' '}},     //KUWAIT
     {REG_DOMAIN_WORLD, {'K', 'Y', ' '}},     //CAYMAN ISLANDS
     {REG_DOMAIN_WORLD, {'K', 'Z', ' '}},     //KAZAKHSTAN
@@ -501,7 +501,7 @@ static tCsrCountryInfo gCsrCountryInfo[eCSR_NUM_COUNTRY_INDEX] =
     {REG_DOMAIN_WORLD, {'M', 'Q', ' '}},     //MARTINIQUE
     {REG_DOMAIN_WORLD, {'M', 'R', ' '}},     //MAURITANIA
     {REG_DOMAIN_WORLD, {'M', 'S', ' '}},     //MONTSERRAT
-    {REG_DOMAIN_WORLD, {'M', 'T', ' '}},      //MALTA     
+    {REG_DOMAIN_WORLD, {'M', 'T', ' '}},      //MALTA
     {REG_DOMAIN_WORLD, {'M', 'U', ' '}},     //MAURITIUS
     {REG_DOMAIN_WORLD, {'M', 'V', ' '}},     //MALDIVES
     {REG_DOMAIN_WORLD, {'M', 'W', ' '}},     //MALAWI
@@ -551,7 +551,7 @@ static tCsrCountryInfo gCsrCountryInfo[eCSR_NUM_COUNTRY_INDEX] =
     {REG_DOMAIN_HI_5GHZ, {'S', 'I', ' '}},      //SLOVENNIA
     {REG_DOMAIN_WORLD, {'S', 'J', ' '}},     //SVALBARD AND JAN MAYEN
     {REG_DOMAIN_HI_5GHZ, {'S', 'K', ' '}},      //SLOVAKIA
-    {REG_DOMAIN_WORLD, {'S', 'L', ' '}},     //SIERRA LEONE      
+    {REG_DOMAIN_WORLD, {'S', 'L', ' '}},     //SIERRA LEONE
     {REG_DOMAIN_WORLD, {'S', 'M', ' '}},     //SAN MARINO
     {REG_DOMAIN_WORLD, {'S', 'N', ' '}},     //SENEGAL
     {REG_DOMAIN_WORLD, {'S', 'O', ' '}},     //SOMALIA
@@ -1431,7 +1431,7 @@ tANI_U8 csrGetInfraOperationChannel( tpAniSirGlobal pMac, tANI_U8 sessionId)
 }
 
 //This routine will return operating channel on FIRST BSS that is active/operating to be used for concurrency mode.
-//If other BSS is not up or not connected it will return 0 
+//If other BSS is not up or not connected it will return 0
 
 tANI_U8 csrGetConcurrentOperationChannel( tpAniSirGlobal pMac )
 {
@@ -1449,8 +1449,8 @@ tANI_U8 csrGetConcurrentOperationChannel( tpAniSirGlobal pMac )
               if (
                       (((pSession->pCurRoamProfile->csrPersona == VOS_STA_MODE) ||
                         (pSession->pCurRoamProfile->csrPersona == VOS_P2P_CLIENT_MODE)) &&
-                       (pSession->connectState == eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED)) 
-                      || 
+                       (pSession->connectState == eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED))
+                      ||
                       (((pSession->pCurRoamProfile->csrPersona == VOS_P2P_GO_MODE) ||
                         (pSession->pCurRoamProfile->csrPersona == VOS_STA_SAP_MODE)) &&
                        (pSession->connectState != eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED))
@@ -1827,7 +1827,7 @@ tANI_BOOLEAN csrIsWmmSupported(tpAniSirGlobal pMac)
 
 
 //pIes is the IEs for pSirBssDesc2
-tANI_BOOLEAN csrIsSsidEqual( tHalHandle hHal, tSirBssDescription *pSirBssDesc1, 
+tANI_BOOLEAN csrIsSsidEqual( tHalHandle hHal, tSirBssDescription *pSirBssDesc1,
                              tSirBssDescription *pSirBssDesc2, tDot11fBeaconIEs *pIes2 )
 {
     tANI_BOOLEAN fEqual = FALSE;
@@ -1934,7 +1934,7 @@ tANI_BOOLEAN csrIsHcfEnabled( tDot11fIEAirgo *pIeAirgo )
 }
 
 
-eCsrMediaAccessType csrGetQoSFromBssDesc( tHalHandle hHal, tSirBssDescription *pSirBssDesc, 
+eCsrMediaAccessType csrGetQoSFromBssDesc( tHalHandle hHal, tSirBssDescription *pSirBssDesc,
                                           tDot11fBeaconIEs *pIes )
 {
     eCsrMediaAccessType qosType = eCSR_MEDIUM_ACCESS_DCF;
@@ -2207,7 +2207,7 @@ tANI_U32 csrTranslateToWNICfgDot11Mode(tpAniSirGlobal pMac, eCsrCfgDot11Mode csr
 
 
 //This function should only return the super set of supported modes. 11n implies 11b/g/a/n.
-eHalStatus csrGetPhyModeFromBss(tpAniSirGlobal pMac, tSirBssDescription *pBSSDescription, 
+eHalStatus csrGetPhyModeFromBss(tpAniSirGlobal pMac, tSirBssDescription *pBSSDescription,
                                 eCsrPhyMode *pPhyMode, tDot11fBeaconIEs *pIes)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -2521,7 +2521,7 @@ tANI_BOOLEAN csrIsPhyModeMatch( tpAniSirGlobal pMac, tANI_U32 phyMode,
         {
             bitMask = 1;
             loopCount = 0;
-            while(loopCount < eCSR_NUM_PHY_MODE)   
+            while(loopCount < eCSR_NUM_PHY_MODE)
             {
                 if(0 != ( phyMode2 = (phyMode & (bitMask << loopCount++)) ))
                 {
@@ -2535,9 +2535,9 @@ tANI_BOOLEAN csrIsPhyModeMatch( tpAniSirGlobal pMac, tANI_U32 phyMode,
         {
             if( pProfile )
             {
-                /* IEEE 11n spec (8.4.3): HT STA shall eliminate TKIP as a 
-                 * choice for the pairwise cipher suite if CCMP is advertised 
-                 * by the AP or if the AP included an HT capabilities element 
+                /* IEEE 11n spec (8.4.3): HT STA shall eliminate TKIP as a
+                 * choice for the pairwise cipher suite if CCMP is advertised
+                 * by the AP or if the AP included an HT capabilities element
                  * in its Beacons and Probe Response.
                  */
                 if( (!CSR_IS_11n_ALLOWED( pProfile->negotiatedUCEncryptionType )) &&
@@ -2694,10 +2694,10 @@ tANI_BOOLEAN csrIsProfileRSN( tCsrRoamProfile *pProfile )
 #ifdef WLAN_FEATURE_VOWIFI_11R
         case eCSR_AUTH_TYPE_FT_RSN:
         case eCSR_AUTH_TYPE_FT_RSN_PSK:
-#endif 
+#endif
 #ifdef FEATURE_WLAN_CCX
         case eCSR_AUTH_TYPE_CCKM_RSN:
-#endif 
+#endif
 #ifdef WLAN_FEATURE_11W
         case eCSR_AUTH_TYPE_RSN_PSK_SHA256:
 #endif
@@ -2854,7 +2854,7 @@ eHalStatus csrUpdateMCCp2pBeaconInterval(tpAniSirGlobal pMac)
 
     for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; sessionId++ )
     {
-        /* If GO in MCC support different beacon interval, 
+        /* If GO in MCC support different beacon interval,
          * change the BI of the P2P-GO */
         if (pMac->roam.roamSession[sessionId].bssParams.bssPersona
                               == VOS_P2P_GO_MODE)
@@ -2887,7 +2887,7 @@ tANI_U16 csrCalculateMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U16 sta_bi, tAN
     tANI_U16 go_fbi = 0;
     tANI_U16 sta_cbi = 0;
 
-    //If GO's given beacon Interval is less than 100 
+    //If GO's given beacon Interval is less than 100
     if(go_gbi < 100)
        go_cbi = 100;
     //if GO's given beacon Interval is greater than or equal to 100
@@ -2908,19 +2908,19 @@ tANI_U16 csrCalculateMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U16 sta_bi, tAN
     {
         return go_cbi;
     }
-    //else , if it is not multiple, then then check for number of beacons to be 
+    //else , if it is not multiple, then then check for number of beacons to be
     //inserted based on sta BI
     num_beacons = sta_bi / 100;
     if (num_beacons)
-    { 
-        // GO's final beacon interval will be aligned to sta beacon interval, but 
+    {
+        // GO's final beacon interval will be aligned to sta beacon interval, but
         //in the range of [100, 199].
         sta_cbi = sta_bi / num_beacons;
         go_fbi = sta_cbi;
     }
     else
     {
-        // if STA beacon interval is less than 100, use GO's change bacon interval 
+        // if STA beacon interval is less than 100, use GO's change bacon interval
         //instead of updating to STA's beacon interval.
         go_fbi = go_cbi;
     }
@@ -2933,7 +2933,7 @@ eHalStatus csrValidateMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U8 channelId,
 {
     tANI_U32 sessionId = 0;
     tANI_U16 new_beaconInterval = 0;
-  
+
     //If MCC is not supported just break
     if (!pMac->roam.configParam.fenableMCCMode){
         return eHAL_STATUS_FAILURE;
@@ -2962,7 +2962,7 @@ eHalStatus csrValidateMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U8 channelId,
                     else if (pMac->roam.roamSession[sessionId].bssParams.bssPersona
                                       == VOS_STA_SAP_MODE)
                     {
-                        if (pMac->roam.roamSession[sessionId].bssParams.operationChn 
+                        if (pMac->roam.roamSession[sessionId].bssParams.operationChn
                                                         != channelId )
                         {
 #ifndef QCA_WIFI_2_0
@@ -2977,11 +2977,11 @@ eHalStatus csrValidateMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U8 channelId,
                     else if (pMac->roam.roamSession[sessionId].bssParams.bssPersona
                                       == VOS_P2P_GO_MODE) //Check for P2P go scenario
                     {
-                        /* if GO in MCC support different beacon interval, 
+                        /* if GO in MCC support different beacon interval,
                          * change the BI of the P2P-GO */
-                       if ((pMac->roam.roamSession[sessionId].bssParams.operationChn 
+                       if ((pMac->roam.roamSession[sessionId].bssParams.operationChn
                                 != channelId ) &&
-                           (pMac->roam.roamSession[sessionId].bssParams.beaconInterval 
+                           (pMac->roam.roamSession[sessionId].bssParams.beaconInterval
                                 != *beaconInterval))
                        {
                            /* if GO in MCC support different beacon interval, return success */
@@ -2996,7 +2996,7 @@ eHalStatus csrValidateMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U8 channelId,
                                    (pMac->roam.configParam.fAllowMCCGODiffBI == 0x04))
                            {
                                //Check to pass the right beacon Interval
-                               new_beaconInterval = csrCalculateMCCBeaconInterval(pMac, *beaconInterval, 
+                               new_beaconInterval = csrCalculateMCCBeaconInterval(pMac, *beaconInterval,
                                                          pMac->roam.roamSession[sessionId].bssParams.beaconInterval);
                                smsLog(pMac, LOG1, FL(" Peer AP BI : %d, new Beacon Interval: %d"),*beaconInterval,new_beaconInterval );
                                //Update the becon Interval
@@ -3039,7 +3039,7 @@ eHalStatus csrValidateMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U8 channelId,
                     else if (pMac->roam.roamSession[sessionId].bssParams.bssPersona
                                       == VOS_STA_SAP_MODE)
                     {
-                        if (pMac->roam.roamSession[sessionId].bssParams.operationChn 
+                        if (pMac->roam.roamSession[sessionId].bssParams.operationChn
                                                         != channelId )
                         {
                             smsLog(pMac, LOGE, FL("***MCC is not enabled for SAP + CLIENT****"));
@@ -3049,9 +3049,9 @@ eHalStatus csrValidateMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U8 channelId,
                     else if (pMac->roam.roamSession[sessionId].bssParams.bssPersona
                                     == VOS_P2P_GO_MODE) //Check for P2P go scenario
                     {
-                        if ((pMac->roam.roamSession[sessionId].bssParams.operationChn 
+                        if ((pMac->roam.roamSession[sessionId].bssParams.operationChn
                                 != channelId ) &&
-                            (pMac->roam.roamSession[sessionId].bssParams.beaconInterval 
+                            (pMac->roam.roamSession[sessionId].bssParams.beaconInterval
                                 != *beaconInterval))
                         {
                             smsLog(pMac, LOGE, FL("BeaconInterval is different cannot connect to P2P_GO network ..."));
@@ -3076,7 +3076,7 @@ eHalStatus csrValidateMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U8 channelId,
                             continue;
                         }
 
-                            
+
                         if (csrIsConnStateConnectedInfra(pMac, sessionId) &&
                            (pMac->roam.roamSession[sessionId].connectedProfile.operationChannel
                                 != channelId ) &&
@@ -3084,11 +3084,11 @@ eHalStatus csrValidateMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U8 channelId,
                                 != *beaconInterval))
                         {
                             /*
-                             * Updated beaconInterval should be used only when we are starting a new BSS 
+                             * Updated beaconInterval should be used only when we are starting a new BSS
                              * not incase of client or STA case
                              */
                             //Calculate beacon Interval for P2P-GO incase of MCC
-                            new_beaconInterval = csrCalculateMCCBeaconInterval(pMac, 
+                            new_beaconInterval = csrCalculateMCCBeaconInterval(pMac,
                                                 pMac->roam.roamSession[sessionId].connectedProfile.beaconInterval,
                                                 *beaconInterval );
                             if(*beaconInterval != new_beaconInterval)
@@ -3118,7 +3118,7 @@ tANI_BOOLEAN csrIsAuthType11r( eCsrAuthType AuthType, tANI_U8 mdiePresent)
         case eCSR_AUTH_TYPE_OPEN_SYSTEM:
             if(mdiePresent)
                 return TRUE;
-            break; 
+            break;
         case eCSR_AUTH_TYPE_FT_RSN_PSK:
         case eCSR_AUTH_TYPE_FT_RSN:
             return TRUE;
@@ -3355,7 +3355,7 @@ static tANI_BOOLEAN csrIsAuthWapiPsk( tpAniSirGlobal pMac, tANI_U8 AllSuites[][C
 
 #ifdef WLAN_FEATURE_VOWIFI_11R
 
-/* 
+/*
  * Function for 11R FT Authentication. We match the FT Authentication Cipher suite
  * here. This matches for FT Auth with the 802.1X exchange.
  *
@@ -3367,7 +3367,7 @@ static tANI_BOOLEAN csrIsFTAuthRSN( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR
     return( csrIsOuiMatch( pMac, AllSuites, cAllSuites, csrRSNOui[03], Oui ) );
 }
 
-/* 
+/*
  * Function for 11R FT Authentication. We match the FT Authentication Cipher suite
  * here. This matches for FT Auth with the PSK.
  *
@@ -3383,7 +3383,7 @@ static tANI_BOOLEAN csrIsFTAuthRSNPsk( tpAniSirGlobal pMac, tANI_U8 AllSuites[][
 
 #ifdef FEATURE_WLAN_CCX
 
-/* 
+/*
  * Function for CCX CCKM AKM Authentication. We match the CCKM AKM Authentication Key Management suite
  * here. This matches for CCKM AKM Auth with the 802.1X exchange.
  *
@@ -3579,8 +3579,8 @@ tANI_BOOLEAN csrGetRSNInformation( tHalHandle hHal, tCsrAuthList *pAuthType, eCs
             }
 
             //Check - Is requested Unicast Cipher supported by the BSS.
-            fAcceptableCyphers = csrMatchRSNOUIIndex( pMac, pRSNIe->pwise_cipher_suites, cUnicastCyphers, 
-                    csrGetOUIIndexFromCipher( enType ), Unicast ); 
+            fAcceptableCyphers = csrMatchRSNOUIIndex( pMac, pRSNIe->pwise_cipher_suites, cUnicastCyphers,
+                    csrGetOUIIndexFromCipher( enType ), Unicast );
 
             if( !fAcceptableCyphers ) break;
 
@@ -3588,7 +3588,7 @@ tANI_BOOLEAN csrGetRSNInformation( tHalHandle hHal, tCsrAuthList *pAuthType, eCs
             //Unicast is supported. Pick the first matching Group cipher, if any.
             for( i = 0 ; i < pMCEncryption->numEntries ; i++ )
             {
-                fAcceptableCyphers = csrMatchRSNOUIIndex( pMac, MulticastCyphers,  cMulticastCyphers, 
+                fAcceptableCyphers = csrMatchRSNOUIIndex( pMac, MulticastCyphers,  cMulticastCyphers,
                             csrGetOUIIndexFromCipher( pMCEncryption->encryptionType[i] ), Multicast );
                 if(fAcceptableCyphers)
                 {
@@ -3599,7 +3599,7 @@ tANI_BOOLEAN csrGetRSNInformation( tHalHandle hHal, tCsrAuthList *pAuthType, eCs
 
             if( pNegotiatedMCCipher )
                 *pNegotiatedMCCipher = pMCEncryption->encryptionType[i];
-            
+
             /* Initializing with FALSE as it has TRUE value already */
             fAcceptableCyphers = FALSE;
             for (i = 0 ; i < pAuthType->numEntries; i++)
@@ -3693,13 +3693,13 @@ tANI_BOOLEAN csrGetRSNInformation( tHalHandle hHal, tCsrAuthList *pAuthType, eCs
 }
 
 
-tANI_BOOLEAN csrIsRSNMatch( tHalHandle hHal, tCsrAuthList *pAuthType, eCsrEncryptionType enType, tCsrEncryptionList *pEnMcType, 
+tANI_BOOLEAN csrIsRSNMatch( tHalHandle hHal, tCsrAuthList *pAuthType, eCsrEncryptionType enType, tCsrEncryptionList *pEnMcType,
                             tDot11fBeaconIEs *pIes, eCsrAuthType *pNegotiatedAuthType, eCsrEncryptionType *pNegotiatedMCCipher )
 {
     tANI_BOOLEAN fRSNMatch = FALSE;
 
         // See if the cyphers in the Bss description match with the settings in the profile.
-    fRSNMatch = csrGetRSNInformation( hHal, pAuthType, enType, pEnMcType, &pIes->RSN, NULL, NULL, NULL, NULL, 
+    fRSNMatch = csrGetRSNInformation( hHal, pAuthType, enType, pEnMcType, &pIes->RSN, NULL, NULL, NULL, NULL,
                                       pNegotiatedAuthType, pNegotiatedMCCipher );
 
     return( fRSNMatch );
@@ -3717,16 +3717,16 @@ tANI_BOOLEAN csrLookupPMKID( tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U8 *p
         smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
         return FALSE;
     }
-   /* to force the AP initiate fresh 802.1x authentication after re-association should not 
-    * fill the PMKID from cache  this is needed 
-    * by the HS 2.0 passpoint certification 5.2.a and b testcases */ 
-    
+   /* to force the AP initiate fresh 802.1x authentication after re-association should not
+    * fill the PMKID from cache  this is needed
+    * by the HS 2.0 passpoint certification 5.2.a and b testcases */
+
     if(pSession->fIgnorePMKIDCache)
     {
         pSession->fIgnorePMKIDCache = FALSE;
         return fRC;
     }
-    
+
     do
     {
         for( Index=0; Index < pSession->NumPmkidCache; Index++ )
@@ -3785,7 +3785,7 @@ tANI_U8 csrConstructRSNIe( tHalHandle hHal, tANI_U32 sessionId, tCsrRoamProfile
         }
 
         // See if the cyphers in the Bss description match with the settings in the profile.
-        fRSNMatch = csrGetRSNInformation( hHal, &pProfile->AuthType, pProfile->negotiatedUCEncryptionType, 
+        fRSNMatch = csrGetRSNInformation( hHal, &pProfile->AuthType, pProfile->negotiatedUCEncryptionType,
                                             &pProfile->mcEncryptionType, &pIesLocal->RSN,
                                             UnicastCypher, MulticastCypher, AuthSuite, &RSNCapabilities, NULL, NULL );
         if ( !fRSNMatch ) break;
@@ -3912,8 +3912,8 @@ tANI_BOOLEAN csrGetWapiInformation( tHalHandle hHal, tCsrAuthList *pAuthType, eC
             }
 
             //Check - Is requested Unicast Cipher supported by the BSS.
-            fAcceptableCyphers = csrMatchWapiOUIIndex( pMac, pWapiIe->unicast_cipher_suites, cUnicastCyphers, 
-                    csrGetOUIIndexFromCipher( enType ), Unicast ); 
+            fAcceptableCyphers = csrMatchWapiOUIIndex( pMac, pWapiIe->unicast_cipher_suites, cUnicastCyphers,
+                    csrGetOUIIndexFromCipher( enType ), Unicast );
 
             if( !fAcceptableCyphers ) break;
 
@@ -3921,7 +3921,7 @@ tANI_BOOLEAN csrGetWapiInformation( tHalHandle hHal, tCsrAuthList *pAuthType, eC
             //Unicast is supported. Pick the first matching Group cipher, if any.
             for( i = 0 ; i < pMCEncryption->numEntries ; i++ )
             {
-                fAcceptableCyphers = csrMatchWapiOUIIndex( pMac, MulticastCyphers,  cMulticastCyphers, 
+                fAcceptableCyphers = csrMatchWapiOUIIndex( pMac, MulticastCyphers,  cMulticastCyphers,
                 csrGetOUIIndexFromCipher( pMCEncryption->encryptionType[i] ), Multicast );
                 if(fAcceptableCyphers)
                 {
@@ -3989,13 +3989,13 @@ tANI_BOOLEAN csrGetWapiInformation( tHalHandle hHal, tCsrAuthList *pAuthType, eC
     return( fAcceptableCyphers );
 }
 
-tANI_BOOLEAN csrIsWapiMatch( tHalHandle hHal, tCsrAuthList *pAuthType, eCsrEncryptionType enType, tCsrEncryptionList *pEnMcType, 
+tANI_BOOLEAN csrIsWapiMatch( tHalHandle hHal, tCsrAuthList *pAuthType, eCsrEncryptionType enType, tCsrEncryptionList *pEnMcType,
                             tDot11fBeaconIEs *pIes, eCsrAuthType *pNegotiatedAuthType, eCsrEncryptionType *pNegotiatedMCCipher )
 {
     tANI_BOOLEAN fWapiMatch = FALSE;
 
         // See if the cyphers in the Bss description match with the settings in the profile.
-    fWapiMatch = csrGetWapiInformation( hHal, pAuthType, enType, pEnMcType, &pIes->WAPI, NULL, NULL, NULL, 
+    fWapiMatch = csrGetWapiInformation( hHal, pAuthType, enType, pEnMcType, &pIes->WAPI, NULL, NULL, NULL,
                                       pNegotiatedAuthType, pNegotiatedMCCipher );
 
     return( fWapiMatch );
@@ -4062,7 +4062,7 @@ tANI_U8 csrConstructWapiIe( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamPro
         }
 
         // See if the cyphers in the Bss description match with the settings in the profile.
-        fWapiMatch = csrGetWapiInformation( pMac, &pProfile->AuthType, pProfile->negotiatedUCEncryptionType, 
+        fWapiMatch = csrGetWapiInformation( pMac, &pProfile->AuthType, pProfile->negotiatedUCEncryptionType,
                                             &pProfile->mcEncryptionType, &pIesLocal->WAPI,
                                             UnicastCypher, MulticastCypher, AuthSuite, NULL, NULL );
         if ( !fWapiMatch ) break;
@@ -4165,7 +4165,7 @@ tANI_BOOLEAN csrGetWpaCyphers( tpAniSirGlobal pMac, tCsrAuthList *pAuthType, eCs
             cAuthSuites = (tANI_U8)(pWpaIe->auth_suite_count);
 
             //Check - Is requested Unicast Cipher supported by the BSS.
-            fAcceptableCyphers = csrMatchWPAOUIIndex( pMac, pWpaIe->unicast_ciphers, cUnicastCyphers, 
+            fAcceptableCyphers = csrMatchWPAOUIIndex( pMac, pWpaIe->unicast_ciphers, cUnicastCyphers,
                     csrGetOUIIndexFromCipher( enType ), Unicast );
 
             if( !fAcceptableCyphers ) break;
@@ -4174,7 +4174,7 @@ tANI_BOOLEAN csrGetWpaCyphers( tpAniSirGlobal pMac, tCsrAuthList *pAuthType, eCs
             //Unicast is supported. Pick the first matching Group cipher, if any.
             for( i = 0 ; i < pMCEncryption->numEntries ; i++ )
             {
-                fAcceptableCyphers = csrMatchWPAOUIIndex( pMac, MulticastCyphers,  cMulticastCyphers, 
+                fAcceptableCyphers = csrMatchWPAOUIIndex( pMac, MulticastCyphers,  cMulticastCyphers,
                             csrGetOUIIndexFromCipher( pMCEncryption->encryptionType[i]), Multicast );
                 if(fAcceptableCyphers)
                 {
@@ -4182,7 +4182,7 @@ tANI_BOOLEAN csrGetWpaCyphers( tpAniSirGlobal pMac, tCsrAuthList *pAuthType, eCs
                 }
             }
             if( !fAcceptableCyphers ) break;
-            
+
             if( pNegotiatedMCCipher )
                 *pNegotiatedMCCipher = pMCEncryption->encryptionType[i];
 
@@ -4261,7 +4261,7 @@ tANI_BOOLEAN csrIsWpaEncryptionMatch( tpAniSirGlobal pMac, tCsrAuthList *pAuthTy
 }
 
 
-tANI_U8 csrConstructWpaIe( tHalHandle hHal, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, 
+tANI_U8 csrConstructWpaIe( tHalHandle hHal, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc,
                            tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe )
 {
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -4450,7 +4450,7 @@ tANI_BOOLEAN csrGetWpaRsnIe( tHalHandle hHal, tANI_U8 *pIes, tANI_U32 len,
 
 //If a WPAIE exists in the profile, just use it. Or else construct one from the BSS
 //Caller allocated memory for pWpaIe and guarrantee it can contain a max length WPA IE
-tANI_U8 csrRetrieveWpaIe( tHalHandle hHal, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, 
+tANI_U8 csrRetrieveWpaIe( tHalHandle hHal, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc,
                           tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe )
 {
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -4483,7 +4483,7 @@ tANI_U8 csrRetrieveWpaIe( tHalHandle hHal, tCsrRoamProfile *pProfile, tSirBssDes
 
 //If a RSNIE exists in the profile, just use it. Or else construct one from the BSS
 //Caller allocated memory for pWpaIe and guarrantee it can contain a max length WPA IE
-tANI_U8 csrRetrieveRsnIe( tHalHandle hHal, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+tANI_U8 csrRetrieveRsnIe( tHalHandle hHal, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                          tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrRSNIe *pRsnIe )
 {
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -4495,15 +4495,15 @@ tANI_U8 csrRetrieveRsnIe( tHalHandle hHal, tANI_U32 sessionId, tCsrRoamProfile *
 #ifdef FEATURE_WLAN_LFR
         if (csrRoamIsFastRoamEnabled(pMac, sessionId))
         {
-            // If "Legacy Fast Roaming" is enabled ALWAYS rebuild the RSN IE from 
+            // If "Legacy Fast Roaming" is enabled ALWAYS rebuild the RSN IE from
             // scratch. So it contains the current PMK-IDs
             cbRsnIe = csrConstructRSNIe(pMac, sessionId, pProfile, pSirBssDesc, pIes, pRsnIe);
         }
-        else 
+        else
 #endif
         if(pProfile->nRSNReqIELength && pProfile->pRSNReqIE)
         {
-            // If you have one started away, re-use it. 
+            // If you have one started away, re-use it.
             if(SIR_MAC_WPA_IE_MAX_LENGTH >= pProfile->nRSNReqIELength)
             {
                 cbRsnIe = (tANI_U8)pProfile->nRSNReqIELength;
@@ -4527,8 +4527,8 @@ tANI_U8 csrRetrieveRsnIe( tHalHandle hHal, tANI_U32 sessionId, tCsrRoamProfile *
 #ifdef FEATURE_WLAN_WAPI
 //If a WAPI IE exists in the profile, just use it. Or else construct one from the BSS
 //Caller allocated memory for pWapiIe and guarrantee it can contain a max length WAPI IE
-tANI_U8 csrRetrieveWapiIe( tHalHandle hHal, tANI_U32 sessionId, 
-                          tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, 
+tANI_U8 csrRetrieveWapiIe( tHalHandle hHal, tANI_U32 sessionId,
+                          tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc,
                           tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe )
 {
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -4691,8 +4691,8 @@ tAniEdType csrTranslateEncryptTypeToEdType( eCsrEncryptionType EncryptType )
 
 
 //pIes can be NULL
-tANI_BOOLEAN csrValidateWep( tpAniSirGlobal pMac, eCsrEncryptionType ucEncryptionType, 
-                             tCsrAuthList *pAuthList, tCsrEncryptionList *pMCEncryptionList, 
+tANI_BOOLEAN csrValidateWep( tpAniSirGlobal pMac, eCsrEncryptionType ucEncryptionType,
+                             tCsrAuthList *pAuthList, tCsrEncryptionList *pMCEncryptionList,
                              eCsrAuthType *pNegotiatedAuthType, eCsrEncryptionType *pNegotiatedMCEncryption,
                              tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes )
 {
@@ -4702,7 +4702,7 @@ tANI_BOOLEAN csrValidateWep( tpAniSirGlobal pMac, eCsrEncryptionType ucEncryptio
     eCsrEncryptionType negotiatedMCCipher = eCSR_ENCRYPT_TYPE_UNKNOWN;
 
     //This function just checks whether HDD is giving correct values for Multicast cipher and Auth.
-    
+
     do
     {
         //If privacy bit is not set, consider no match
@@ -4728,7 +4728,7 @@ tANI_BOOLEAN csrValidateWep( tpAniSirGlobal pMac, eCsrEncryptionType ucEncryptio
                     fMatch = FALSE;
                     break;
             }
-            if(fMatch) break; 
+            if(fMatch) break;
         }
 
         if(!fMatch) break;
@@ -4787,7 +4787,7 @@ tANI_BOOLEAN csrValidateWep( tpAniSirGlobal pMac, eCsrEncryptionType ucEncryptio
 
         if( pNegotiatedMCEncryption )
             *pNegotiatedMCEncryption = negotiatedMCCipher;
-    }    
+    }
 
 
     return fMatch;
@@ -4796,7 +4796,7 @@ tANI_BOOLEAN csrValidateWep( tpAniSirGlobal pMac, eCsrEncryptionType ucEncryptio
 
 //pIes shall contain IEs from pSirBssDesc. It shall be returned from function csrGetParsedBssDescriptionIEs
 tANI_BOOLEAN csrIsSecurityMatch( tHalHandle hHal, tCsrAuthList *authType, tCsrEncryptionList *pUCEncryptionType, tCsrEncryptionList *pMCEncryptionType,
-                                 tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, 
+                                 tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes,
                                  eCsrAuthType *negotiatedAuthtype, eCsrEncryptionType *negotiatedUCCipher, eCsrEncryptionType *negotiatedMCCipher )
 {
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -4852,7 +4852,7 @@ tANI_BOOLEAN csrIsSecurityMatch( tHalHandle hHal, tCsrAuthList *authType, tCsrEn
                                negAuthType = eCSR_AUTH_TYPE_OPEN_SYSTEM;
                                break;
                             }
-                        } 
+                        }
                         if (!fMatch) break;
 
                     }
@@ -4885,7 +4885,7 @@ tANI_BOOLEAN csrIsSecurityMatch( tHalHandle hHal, tCsrAuthList *authType, tCsrEn
                         if( !fMatch )
                         {
                             // If not RSN, then check if there is a WPA match
-                            fMatch = csrIsWpaEncryptionMatch( pMac, authType, ucCipher, pMCEncryptionType, pIes, 
+                            fMatch = csrIsWpaEncryptionMatch( pMac, authType, ucCipher, pMCEncryptionType, pIes,
                                                               &negAuthType, &mcCipher );
                         }
                     }
@@ -4909,8 +4909,8 @@ tANI_BOOLEAN csrIsSecurityMatch( tHalHandle hHal, tCsrAuthList *authType, tCsrEn
                    break;
                }
 #endif /* FEATURE_WLAN_WAPI */
-            case eCSR_ENCRYPT_TYPE_ANY: 
-            default: 
+            case eCSR_ENCRYPT_TYPE_ANY:
+            default:
             {
                 tANI_BOOLEAN fMatchAny = eANI_BOOLEAN_FALSE;
 
@@ -4973,14 +4973,14 @@ tANI_BOOLEAN csrIsSecurityMatch( tHalHandle hHal, tCsrAuthList *authType, tCsrEn
 
     }
 
-    if( fMatch ) 
+    if( fMatch )
     {
         if( negotiatedUCCipher )
             *negotiatedUCCipher = ucCipher;
-   
+
         if( negotiatedMCCipher )
             *negotiatedMCCipher = mcCipher;
-   
+
         if( negotiatedAuthtype )
             *negotiatedAuthtype = negAuthType;
     }
@@ -5455,7 +5455,7 @@ static tANI_BOOLEAN csrIsRateSetMatch( tpAniSirGlobal pMac,
 
 
 //ppIes can be NULL. If caller want to get the *ppIes allocated by this function, pass in *ppIes = NULL
-tANI_BOOLEAN csrMatchBSS( tHalHandle hHal, tSirBssDescription *pBssDesc, tCsrScanResultFilter *pFilter, 
+tANI_BOOLEAN csrMatchBSS( tHalHandle hHal, tSirBssDescription *pBssDesc, tCsrScanResultFilter *pFilter,
                           eCsrAuthType *pNegAuth, eCsrEncryptionType *pNegUc, eCsrEncryptionType *pNegMc,
                           tDot11fBeaconIEs **ppIes)
 {
@@ -5479,7 +5479,7 @@ tANI_BOOLEAN csrMatchBSS( tHalHandle hHal, tSirBssDescription *pBssDesc, tCsrSca
             //Save the one pass in for local use
             pIes = *ppIes;
         }
-        
+
         //Check if caller wants P2P
         fCheck = (!pFilter->p2pResult || pIes->P2PBeaconProbeRes.present);
         if(!fCheck) break;
@@ -5503,7 +5503,7 @@ tANI_BOOLEAN csrMatchBSS( tHalHandle hHal, tSirBssDescription *pBssDesc, tCsrSca
 
             if (pFilter->p2pResult && pIes->P2PBeaconProbeRes.present)
             {
-               fCheck = csrIsBssidMatch( pMac, (tCsrBssid *)&pFilter->BSSIDs.bssid[i], 
+               fCheck = csrIsBssidMatch( pMac, (tCsrBssid *)&pFilter->BSSIDs.bssid[i],
                               (tCsrBssid *)pIes->P2PBeaconProbeRes.P2PDeviceInfo.P2PDeviceAddress );
 
                if ( fCheck ) break;
@@ -5572,7 +5572,7 @@ tANI_BOOLEAN csrMatchBSS( tHalHandle hHal, tSirBssDescription *pBssDesc, tCsrSca
     return( fRC );
 }
 
-tANI_BOOLEAN csrMatchConnectedBSSSecurity( tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pProfile, 
+tANI_BOOLEAN csrMatchConnectedBSSSecurity( tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pProfile,
                                            tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes)
 {
     tCsrEncryptionList ucEncryptionList, mcEncryptionList;
@@ -6128,7 +6128,7 @@ v_CountryInfoSource_t source
         }
         else
         {
-            smsLog(pMac, LOGW, FL("  doesn't match country %c%c"), pCountry[0], pCountry[1]);
+            smsLog(pMac, LOGE, FL("  doesn't match country %c%c, status %d"), pCountry[0], pCountry[1], vosStatus);
             status = eHAL_STATUS_INVALID_PARAMETER;
         }
     }
@@ -6364,12 +6364,12 @@ eHalStatus csrSetModifyProfileFields(tpAniSirGlobal pMac, tANI_U32 sessionId,
 /* ---------------------------------------------------------------------------
     \fn csrGetSupportedCountryCode
     \brief this function is to get a list of the country code current being supported
-    \param pBuf - Caller allocated buffer with at least 3 bytes, upon success return, 
+    \param pBuf - Caller allocated buffer with at least 3 bytes, upon success return,
     this has the country code list. 3 bytes for each country code. This may be NULL if
     caller wants to know the needed bytes.
     \param pbLen - Caller allocated, as input, it indicates the length of pBuf. Upon success return,
     this contains the length of the data in pBuf
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrGetSupportedCountryCode(tpAniSirGlobal pMac, tANI_U8 *pBuf, tANI_U32 *pbLen)
 {
@@ -6405,12 +6405,12 @@ eHalStatus csrGetSupportedCountryCode(tpAniSirGlobal pMac, tANI_U8 *pBuf, tANI_U
 /* ---------------------------------------------------------------------------
     \fn csrGetSupportedCountryCode
     \brief this function is to get a list of the country code current being supported
-    \param pBuf - Caller allocated buffer with at least 3 bytes, upon success return, 
+    \param pBuf - Caller allocated buffer with at least 3 bytes, upon success return,
     this has the country code list. 3 bytes for each country code. This may be NULL if
     caller wants to know the needed bytes.
     \param pbLen - Caller allocated, as input, it indicates the length of pBuf. Upon success return,
     this contains the length of the data in pBuf
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrGetSupportedCountryCode(tpAniSirGlobal pMac, tANI_U8 *pBuf, tANI_U32 *pbLen)
 {
@@ -6452,7 +6452,7 @@ eHalStatus csrScanGetBaseChannels( tpAniSirGlobal pMac, tCsrChannelInfo * pChann
 
     do
     {
-    
+
        if(!pMac->scan.baseChannels.numChannels || !pChannelInfo)
        {
           break;
@@ -6485,12 +6485,12 @@ tANI_BOOLEAN csrIsSetKeyAllowed(tpAniSirGlobal pMac, tANI_U32 sessionId)
     * the pSession->pCurRoamProfile is NULL. And this function returns TRUE, that is incorrect.
     * Since SAP requires to set key without any BSS started, it needs this condition to be met.
     * In other words, this function is useless.
-    * The current work-around is to process setcontext_rsp and removekey_rsp no matter what the 
+    * The current work-around is to process setcontext_rsp and removekey_rsp no matter what the
     * state is.
     */
     smsLog( pMac, LOG2, FL(" is not what it intends to. Must be revisit or removed") );
-    if( (NULL == pSession) || 
-        ( csrIsConnStateDisconnected( pMac, sessionId ) && 
+    if( (NULL == pSession) ||
+        ( csrIsConnStateDisconnected( pMac, sessionId ) &&
         (pSession->pCurRoamProfile != NULL) &&
         (!(CSR_IS_INFRA_AP(pSession->pCurRoamProfile))) )
         )
@@ -6506,9 +6506,9 @@ tANI_U16 sme_ChnToFreq(tANI_U8 chanNum)
 {
    int i;
 
-   for (i = 0; i < NUM_RF_CHANNELS; i++) 
+   for (i = 0; i < NUM_RF_CHANNELS; i++)
    {
-      if (rfChannels[i].channelNum == chanNum) 
+      if (rfChannels[i].channelNum == chanNum)
       {
          return rfChannels[i].targetFreq;
       }
@@ -6517,14 +6517,14 @@ tANI_U16 sme_ChnToFreq(tANI_U8 chanNum)
    return (0);
 }
 
-/* Disconnect all active sessions by sending disassoc. This is mainly used to disconnect the remaining session when we 
- * transition from concurrent sessions to a single session. The use case is Infra STA and wifi direct multiple sessions are up and 
+/* Disconnect all active sessions by sending disassoc. This is mainly used to disconnect the remaining session when we
+ * transition from concurrent sessions to a single session. The use case is Infra STA and wifi direct multiple sessions are up and
  * P2P session is removed. The Infra STA session remains and should resume BMPS if BMPS is enabled by default. However, there
  * are some issues seen with BMPS resume during this transition and this is a workaround which will allow the Infra STA session to
  * disconnect and auto connect back and enter BMPS this giving the same effect as resuming BMPS
  */
- 
-//Remove this code once SLM_Sessionization is supported 
+
+//Remove this code once SLM_Sessionization is supported
 //BMPS_WORKAROUND_NOT_NEEDED
 void csrDisconnectAllActiveSessions(tpAniSirGlobal pMac)
 {
diff --git a/CORE/SME/src/p2p/p2p_Api.c b/CORE/SME/src/p2p/p2p_Api.c
index d9fc0efc1c81..44f300a0796e 100644
--- a/CORE/SME/src/p2p/p2p_Api.c
+++ b/CORE/SME/src/p2p/p2p_Api.c
@@ -75,14 +75,14 @@ eHalStatus p2pProcessRemainOnChannelCmd(tpAniSirGlobal pMac, tSmeCmd *p2pRemaino
 #endif
 
 #ifdef WLAN_FEATURE_P2P_INTERNAL
-    if( !pSession->sessionActive || (CSR_SESSION_ID_INVALID == P2PsessionId)) 
+    if( !pSession->sessionActive || (CSR_SESSION_ID_INVALID == P2PsessionId))
     {
        smsLog(pMac, LOGE, FL("  session %d (P2P session %d) is invalid or listen is disabled "),
             p2pRemainonChn->sessionId, P2PsessionId);
        return eHAL_STATUS_FAILURE;
     }
 #else
-    if(!pSession->sessionActive) 
+    if(!pSession->sessionActive)
     {
        smsLog(pMac, LOGE, FL("  session %d is invalid or listen is disabled "),
             p2pRemainonChn->sessionId);
@@ -90,8 +90,8 @@ eHalStatus p2pProcessRemainOnChannelCmd(tpAniSirGlobal pMac, tSmeCmd *p2pRemaino
     }
 #endif
 #ifdef WLAN_FEATURE_P2P_INTERNAL
-    P2P_GetIE(p2pContext, 
-              p2pContext->sessionId, eP2P_PROBE_RSP, 
+    P2P_GetIE(p2pContext,
+              p2pContext->sessionId, eP2P_PROBE_RSP,
               &p2pContext->probeRspIe, &ieLen);
     p2pContext->probeRspIeLength = ieLen;
     len = sizeof(tSirRemainOnChnReq) + ieLen;
@@ -136,7 +136,7 @@ eHalStatus p2pProcessRemainOnChannelCmd(tpAniSirGlobal pMac, tSmeCmd *p2pRemaino
 #endif
         status = palSendMBMessage(pMac->hHdd, pMsg);
     }
-    
+
     return status;
 }
 
@@ -267,7 +267,7 @@ eHalStatus sme_remainOnChnReady( tHalHandle hHal, tANI_U8* pMsg)
     eHalStatus  status = eHAL_STATUS_SUCCESS;
     tListElem *pEntry = NULL;
     tSmeCmd *pCommand = NULL;
-    tCsrRoamInfo RoamInfo; 
+    tCsrRoamInfo RoamInfo;
 #ifdef WLAN_FEATURE_P2P_INTERNAL
     tSirSmeRsp *pRsp = (tSirSmeRsp *)pMsg;
     //pRsp->sessionId is SME's session index
@@ -298,12 +298,12 @@ eHalStatus sme_remainOnChnReady( tHalHandle hHal, tANI_U8* pMsg)
 #else
             /* forward the indication to HDD */
             RoamInfo.pRemainCtx = pCommand->u.remainChlCmd.callbackCtx;
-            csrRoamCallCallback(pMac, ((tSirSmeRsp*)pMsg)->sessionId, &RoamInfo, 
+            csrRoamCallCallback(pMac, ((tSirSmeRsp*)pMsg)->sessionId, &RoamInfo,
                                 0, eCSR_ROAM_REMAIN_CHAN_READY, 0);
 #endif
         }
     }
-  
+
     return status;
 }
 
@@ -374,10 +374,10 @@ eHalStatus sme_sendActionCnf( tHalHandle hHal, tANI_U8* pMsg)
 
    if(pP2pContext->pSentActionFrame)
    {
-      csrRoamCallCallback((tpAniSirGlobal)pP2pContext->hHal, 
-                     pP2pContext->SMEsessionId, &RoamInfo, 0, 
-                     eCSR_ROAM_SEND_ACTION_CNF, 
-                     ((rspStatus == eSIR_SME_SUCCESS) ? 
+      csrRoamCallCallback((tpAniSirGlobal)pP2pContext->hHal,
+                     pP2pContext->SMEsessionId, &RoamInfo, 0,
+                     eCSR_ROAM_SEND_ACTION_CNF,
+                     ((rspStatus == eSIR_SME_SUCCESS) ?
                      eCSR_ROAM_RESULT_NONE: eCSR_ROAM_RESULT_SEND_ACTION_FAIL));
    }
 
@@ -423,9 +423,9 @@ eHalStatus sme_sendActionCnf( tHalHandle hHal, tANI_U8* pMsg)
       {
          smsLog(pMac, LOGE, FL(" %s fail to start timer status %d"), __func__, status);
          //Without the timer we cannot continue
-         csrRoamCallCallback((tpAniSirGlobal)pP2pContext->hHal, 
-                     pP2pContext->SMEsessionId, &RoamInfo, 0, 
-                     eCSR_ROAM_SEND_ACTION_CNF, 
+         csrRoamCallCallback((tpAniSirGlobal)pP2pContext->hHal,
+                     pP2pContext->SMEsessionId, &RoamInfo, 0,
+                     eCSR_ROAM_SEND_ACTION_CNF,
                      eCSR_ROAM_RESULT_SEND_ACTION_FAIL);
          vos_spin_lock_acquire(&pP2pContext->lState);
          pBuf = pP2pContext->pSentActionFrame;
@@ -452,15 +452,15 @@ eHalStatus sme_sendActionCnf( tHalHandle hHal, tANI_U8* pMsg)
    {
       p2pFsm(pP2pContext, eP2P_TRIGGER_DISCONNECTED);
    }
-    
-#else  
+
+#else
     /* forward the indication to HDD */
     //RoamInfo can be passed as NULL....todo
-    csrRoamCallCallback(pMac, pSmeRsp->sessionId, &RoamInfo, 0, 
-                        eCSR_ROAM_SEND_ACTION_CNF, 
+    csrRoamCallCallback(pMac, pSmeRsp->sessionId, &RoamInfo, 0,
+                        eCSR_ROAM_SEND_ACTION_CNF,
                        (pSmeRsp->statusCode == eSIR_SME_SUCCESS) ? 0:
                         eCSR_ROAM_RESULT_SEND_ACTION_FAIL);
-#endif    
+#endif
     return status;
 }
 
@@ -509,7 +509,7 @@ void p2pResetContext(tp2pContext *pP2pContext)
       {
          vos_mem_free(pP2pContext->pSentActionFrame);
          pP2pContext->pSentActionFrame = NULL;
-      }      
+      }
       if( pP2pContext->probeRspIe )
       {
          vos_mem_free(pP2pContext->probeRspIe);
@@ -589,7 +589,7 @@ void p2pResetContext(tp2pContext *pP2pContext)
       vos_mem_zero(pP2pContext->peerMacAddress, P2P_MAC_ADDRESS_LEN);
    }
 }
-#endif    
+#endif
 
 
 eHalStatus sme_p2pOpen( tHalHandle hHal )
@@ -601,7 +601,7 @@ eHalStatus sme_p2pOpen( tHalHandle hHal )
    int i;
    tp2pContext *pP2pContext;
 
-   for ( i=0; i < MAX_NO_OF_P2P_SESSIONS; i++ ) 
+   for ( i=0; i < MAX_NO_OF_P2P_SESSIONS; i++ )
    {
       pP2pContext = &pMac->p2pContext[i];
       pP2pContext->hHal = hHal;
@@ -626,7 +626,7 @@ eHalStatus sme_p2pOpen( tHalHandle hHal )
       {
          smsLog(pMac, LOGE, " %s fail to alloc listen timer for session %d", __func__, i);
          break;
-      } 
+      }
       status = vos_timer_init(&pP2pContext->discoverTimer, VOS_TIMER_TYPE_SW, p2pDiscoverTimerHandler, pP2pContext);
       if (!VOS_IS_STATUS_SUCCESS(status))
       {
@@ -665,17 +665,17 @@ eHalStatus p2pStop( tHalHandle hHal )
 #ifdef WLAN_FEATURE_P2P_INTERNAL
    int i;
 
-   for ( i = 0; i < MAX_NO_OF_P2P_SESSIONS; i++ ) 
+   for ( i = 0; i < MAX_NO_OF_P2P_SESSIONS; i++ )
    {
       p2pCloseSession(pMac, i);
    }
-#else  
+#else
    if( pMac->p2pContext.probeRspIe )
    {
       vos_mem_free(pMac->p2pContext.probeRspIe);
       pMac->p2pContext.probeRspIe = NULL;
    }
-  
+
    pMac->p2pContext.probeRspIeLength = 0;
 #endif
 
@@ -693,7 +693,7 @@ eHalStatus sme_p2pClose( tHalHandle hHal )
 
    p2pStop(hHal);
 
-   for ( i = 0; i < MAX_NO_OF_P2P_SESSIONS; i++ ) 
+   for ( i = 0; i < MAX_NO_OF_P2P_SESSIONS; i++ )
    {
       p2pCloseSession(pMac, i);
       pContext = &pMac->p2pContext[i];
@@ -723,13 +723,13 @@ eHalStatus sme_p2pClose( tHalHandle hHal )
 
       vos_spin_lock_destroy(&pContext->lState);
    }
-#else  
+#else
     if( pMac->p2pContext.probeRspIe )
     {
         vos_mem_free(pMac->p2pContext.probeRspIe);
         pMac->p2pContext.probeRspIe = NULL;
     }
-  
+
     pMac->p2pContext.probeRspIeLength = 0;
 #endif
 
@@ -765,7 +765,7 @@ tSirRFBand GetRFBand(tANI_U8 channel)
   -------------------------------------------------------------------------------*/
 eHalStatus p2pRemainOnChannel(tHalHandle hHal, tANI_U8 sessionId,
          tANI_U8 channel, tANI_U32 duration,
-        remainOnChanCallback callback, 
+        remainOnChanCallback callback,
         void *pContext, tANI_U8 isP2PProbeReqAllowed
 #ifdef WLAN_FEATURE_P2P_INTERNAL
         , eP2PRemainOnChnReason reason
@@ -776,11 +776,11 @@ eHalStatus p2pRemainOnChannel(tHalHandle hHal, tANI_U8 sessionId,
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
     tSmeCmd *pRemainChlCmd = NULL;
     tANI_U32 phyMode;
-  
+
     pRemainChlCmd = smeGetCommandBuffer(pMac);
     if(pRemainChlCmd == NULL)
         return eHAL_STATUS_FAILURE;
-  
+
     if (SIR_BAND_5_GHZ == GetRFBand(channel))
     {
        phyMode = WNI_CFG_PHY_MODE_11A;
@@ -789,7 +789,7 @@ eHalStatus p2pRemainOnChannel(tHalHandle hHal, tANI_U8 sessionId,
     {
        phyMode = WNI_CFG_PHY_MODE_11G;
     }
-    
+
     cfgSetInt(pMac, WNI_CFG_PHY_MODE, phyMode);
 
     do
@@ -802,7 +802,7 @@ eHalStatus p2pRemainOnChannel(tHalHandle hHal, tANI_U8 sessionId,
         pRemainChlCmd->u.remainChlCmd.isP2PProbeReqAllowed = isP2PProbeReqAllowed;
         pRemainChlCmd->u.remainChlCmd.callback = callback;
         pRemainChlCmd->u.remainChlCmd.callbackCtx = pContext;
-    
+
         //Put it at the head of the Q if we just finish finding the peer and ready to send a frame
 #ifdef WLAN_FEATURE_P2P_INTERNAL
         smePushCommand(pMac, pRemainChlCmd, (eP2PRemainOnChnReasonSendFrame == reason));
@@ -810,9 +810,9 @@ eHalStatus p2pRemainOnChannel(tHalHandle hHal, tANI_U8 sessionId,
         csrQueueSmeCommand(pMac, pRemainChlCmd, eANI_BOOLEAN_FALSE);
 #endif
     } while(0);
-  
+
     smsLog(pMac, LOGW, "exiting function %s", __func__);
-  
+
     return(status);
 }
 
@@ -865,7 +865,7 @@ eHalStatus p2pCancelRemainOnChannel(tHalHandle hHal, tANI_U8 sessionId)
         pMsg->msgLen = pal_cpu_to_be16(msgLen);
         pMsg->sessionId = sessionId;
         status = palSendMBMessage(pMac->hHdd, pMsg);
-    }                             
+    }
 
     return( status );
 }
@@ -888,7 +888,7 @@ eHalStatus p2pSetPs(tHalHandle hHal, tP2pPsConfig *pNoA)
         msg.bodyval = 0;
         msg.bodyptr = pNoAParam;
         limPostMsgApi(pMac, &msg);
-    }   
+    }
     return status;
 }
 
@@ -937,9 +937,9 @@ eHalStatus p2pChangeDefaultConfigParam(tHalHandle hHal, tP2PConfigParam *pParam)
 
    if(pParam)
    {
-      for ( i=0; i < MAX_NO_OF_P2P_SESSIONS; i++ ) 
+      for ( i=0; i < MAX_NO_OF_P2P_SESSIONS; i++ )
       {
-         if (pParam->P2PListenChannel == 1 || pParam->P2PListenChannel == 6 
+         if (pParam->P2PListenChannel == 1 || pParam->P2PListenChannel == 6
                || pParam->P2PListenChannel == 11)
          {
             pMac->p2pContext[i].P2PListenChannel = pParam->P2PListenChannel;
@@ -947,11 +947,11 @@ eHalStatus p2pChangeDefaultConfigParam(tHalHandle hHal, tP2PConfigParam *pParam)
          else
          {
             pMac->p2pContext[i].P2PListenChannel = P2P_OPERATING_CHANNEL;
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
                "Invalid P2P Listen Channel in config. Switch to default Listen Channel %d",
                __func__, P2P_OPERATING_CHANNEL);
          }
-         
+
          if(csrRoamIsChannelValid(pMac, pParam->P2POperatingChannel))
          {
             pMac->p2pContext[i].P2POperatingChannel = pParam->P2POperatingChannel;
@@ -1001,7 +1001,7 @@ eHalStatus p2pPS(tHalHandle hHal, tANI_U8 sessionId)
       pNoA.ctWindow = pMac->p2pContext[sessionId].pNoA.ctWindow;
       pNoA.count = 0;
       pNoA.duration = 0;
-      pNoA.interval = 0; 
+      pNoA.interval = 0;
       pNoA.single_noa_duration = 0;
    }
    else if (pMac->p2pContext[sessionId].pNoA.psSelection == P2P_PERIODIC_NOA)
@@ -1010,24 +1010,24 @@ eHalStatus p2pPS(tHalHandle hHal, tANI_U8 sessionId)
       pNoA.ctWindow = 0;
       pNoA.count = pMac->p2pContext[sessionId].pNoA.count;
       pNoA.duration = pMac->p2pContext[sessionId].pNoA.duration;
-      pNoA.interval = pMac->p2pContext[sessionId].pNoA.interval; 
+      pNoA.interval = pMac->p2pContext[sessionId].pNoA.interval;
       pNoA.single_noa_duration = 0;
-   } 
+   }
    else if(pMac->p2pContext[sessionId].pNoA.psSelection == P2P_SINGLE_NOA)
    {
       pNoA.opp_ps = 0;
       pNoA.ctWindow = 0;
       pNoA.count = 0;
       pNoA.duration = 0;
-      pNoA.interval = 0; 
+      pNoA.interval = 0;
       pNoA.single_noa_duration = pMac->p2pContext[sessionId].pNoA.duration;
    }
 
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
       " %s HDDSession %d set NoA parameters. Selection %d, opp_ps %d, ctWindow %d, count %d, "
       "duration %d, interval %d single NoA duration %d",
       __func__, sessionId, pMac->p2pContext[sessionId].pNoA.psSelection,
-      pNoA.opp_ps, pNoA.ctWindow, pNoA.count, pNoA.duration, 
+      pNoA.opp_ps, pNoA.ctWindow, pNoA.count, pNoA.duration,
       pNoA.interval, pNoA.single_noa_duration );
 
    status = sme_p2pSetPs(pMac, &pNoA);
@@ -1128,8 +1128,8 @@ void p2pActionFrameTimerHandler(void *pContext)
    if(p2pContext->pSentActionFrame)
    {
       vos_mem_zero(&roamInfo, sizeof(tCsrRoamInfo));
-      csrRoamCallCallback((tpAniSirGlobal)p2pContext->hHal, p2pContext->SMEsessionId, &roamInfo, 0, 
-                          eCSR_ROAM_SEND_ACTION_CNF, 
+      csrRoamCallCallback((tpAniSirGlobal)p2pContext->hHal, p2pContext->SMEsessionId, &roamInfo, 0,
+                          eCSR_ROAM_SEND_ACTION_CNF,
                           eCSR_ROAM_RESULT_SEND_ACTION_FAIL);
    }
 
@@ -1162,8 +1162,8 @@ void p2pActionFrameTimerHandler(void *pContext)
          p2pContext->ActionFrameLen = p2pContext->nNextFrmLen;
          p2pContext->actionFrameType = p2pContext->NextActionFrameType;
          vos_mem_zero(&roamInfo, sizeof(tCsrRoamInfo));
-         csrRoamCallCallback((tpAniSirGlobal)p2pContext->hHal, p2pContext->SMEsessionId, &roamInfo, 0, 
-                          eCSR_ROAM_SEND_ACTION_CNF, 
+         csrRoamCallCallback((tpAniSirGlobal)p2pContext->hHal, p2pContext->SMEsessionId, &roamInfo, 0,
+                          eCSR_ROAM_SEND_ACTION_CNF,
                           eCSR_ROAM_RESULT_SEND_ACTION_FAIL);
          p2pContext->pSentActionFrame = NULL;
          vos_mem_free(pNextBuf);
@@ -1177,7 +1177,7 @@ void p2pActionFrameTimerHandler(void *pContext)
 }
 
 
-eHalStatus p2pCreateActionFrame(tpAniSirGlobal pMac, tANI_U8 SessionID, void *p2pactionframe, 
+eHalStatus p2pCreateActionFrame(tpAniSirGlobal pMac, tANI_U8 SessionID, void *p2pactionframe,
                                  eP2PFrameType actionFrameType, tANI_U8 **ppFrm)
 {
    eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -1242,7 +1242,7 @@ eHalStatus p2pCreateActionFrame(tpAniSirGlobal pMac, tANI_U8 SessionID, void *p2
    if (NULL == pBuf)
    {
       smsLog(pMac, LOGE, FL("  fail to allocate memory"));
-      if (pActionFrm) 
+      if (pActionFrm)
          vos_mem_free(pActionFrm);
       return eHAL_STATUS_FAILURE;
    }
@@ -1301,7 +1301,7 @@ static eHalStatus p2pSendActionFrame(tpAniSirGlobal pMac, tANI_U8 HDDSessionID,
    tp2pContext *pP2pContext = &pMac->p2pContext[HDDSessionID];
 
    pP2pContext->GroupFormationPending = TRUE;
-   if (actionFrameType == eP2P_GONEGO_REQ || actionFrameType == eP2P_PROVISION_DISCOVERY_REQUEST 
+   if (actionFrameType == eP2P_GONEGO_REQ || actionFrameType == eP2P_PROVISION_DISCOVERY_REQUEST
       || actionFrameType == eP2P_INVITATION_REQ)
    {
       vos_mem_zero(&filter, sizeof(filter));
@@ -1318,13 +1318,13 @@ static eHalStatus p2pSendActionFrame(tpAniSirGlobal pMac, tANI_U8 HDDSessionID,
          if(pScanResult)
          {
 
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s found match on channel %d", 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s found match on channel %d",
                __func__, pScanResult->BssDescriptor.channelId);
             pP2pContext->formationReq.targetListenChannel = pScanResult->BssDescriptor.channelId;
             if(pP2pContext->P2PListenChannel != pScanResult->BssDescriptor.channelId)
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
-                  "%s adapt listen channel to %d", 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
+                  "%s adapt listen channel to %d",
                   __func__, pScanResult->BssDescriptor.channelId);
                p2pSetListenChannel(pMac, pP2pContext->sessionId, pScanResult->BssDescriptor.channelId);
             }
@@ -1333,8 +1333,8 @@ static eHalStatus p2pSendActionFrame(tpAniSirGlobal pMac, tANI_U8 HDDSessionID,
                          P2P_MAC_ADDRESS_LEN);
          }
          csrScanResultPurge(pMac, hScanResult);
-      } 
-      else 
+      }
+      else
       {
          vos_mem_zero(&filter, sizeof(filter));
          filter.bWPSAssociation = TRUE;
@@ -1381,22 +1381,22 @@ static eHalStatus p2pSendActionFrame(tpAniSirGlobal pMac, tANI_U8 HDDSessionID,
             vos_mem_copy(pP2pContext->formationReq.deviceAddress,
                          pP2pContext->peerMacAddress, P2P_MAC_ADDRESS_LEN);
             status = eHAL_STATUS_SUCCESS;
-         }    
+         }
       }
       sme_CancelRemainOnChannel(pMac, pP2pContext->SMEsessionId );
-      p2pFsm(pP2pContext, eP2P_TRIGGER_GROUP_FORMATION);     
+      p2pFsm(pP2pContext, eP2P_TRIGGER_GROUP_FORMATION);
       VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, " %s send action frame %d timeout %d",
                __func__, actionFrameType, pP2pContext->ActionFrameSendTimeout);
-   } 
+   }
    else
    {
       pP2pContext->PeerFound = TRUE;
 
-      status = p2pSendAction(pMac, pP2pContext->SMEsessionId, (tANI_U8 *)pP2pContext->pSentActionFrame, 
+      status = p2pSendAction(pMac, pP2pContext->SMEsessionId, (tANI_U8 *)pP2pContext->pSentActionFrame,
                               pP2pContext->ActionFrameLen);
       if(status != eHAL_STATUS_SUCCESS)
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,  
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
             "%s p2pSendAction failed to send frame type %d", __func__, actionFrameType);
          pP2pContext->GroupFormationPending = FALSE;
          return status;
@@ -1407,7 +1407,7 @@ static eHalStatus p2pSendActionFrame(tpAniSirGlobal pMac, tANI_U8 HDDSessionID,
          VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Calling p2pRemainOnChannel with duration"
             "%d on channel %d", __func__, P2P_REMAIN_ON_CHAN_TIMEOUT, pP2pContext->P2PListenChannel);
 
-         if(p2pRemainOnChannel( pMac, pP2pContext->SMEsessionId, 
+         if(p2pRemainOnChannel( pMac, pP2pContext->SMEsessionId,
                                       pP2pContext->P2PListenChannel, P2P_REMAIN_ON_CHAN_TIMEOUT_LOW,
                                       NULL, NULL, TRUE, eP2PRemainOnChnReasonSendFrame))
          {
@@ -1422,21 +1422,21 @@ static eHalStatus p2pSendActionFrame(tpAniSirGlobal pMac, tANI_U8 HDDSessionID,
 
 #define WLAN_P2P_DEF_ACTION_FRM_TIMEOUT_VALUE 1000  //1s
 
-eHalStatus p2pCreateSendActionFrame(tHalHandle hHal, tANI_U8 HDDSessionID, 
+eHalStatus p2pCreateSendActionFrame(tHalHandle hHal, tANI_U8 HDDSessionID,
    void *p2pactionframe, eP2PFrameType actionFrameType, tANI_U32 timeout)
 {
    eHalStatus status = eHAL_STATUS_SUCCESS;
    tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
    tANI_U8 *pBuf = NULL;
    tp2pContext *pP2pContext = &pMac->p2pContext[HDDSessionID];
-   
+
    status = p2pCreateActionFrame(pMac, HDDSessionID, p2pactionframe, actionFrameType, &pBuf);
    if(!HAL_STATUS_SUCCESS(status))
    {
       smsLog(pMac, LOGE, FL("  fail to create action frame"));
       return status;
    }
-      
+
    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, " %s send action frame %d timeout %d",
                   __func__, actionFrameType, timeout);
 
@@ -1460,9 +1460,9 @@ eHalStatus p2pCreateSendActionFrame(tHalHandle hHal, tANI_U8 HDDSessionID,
          vos_mem_zero(&RoamInfo, sizeof(tCsrRoamInfo));
          smsLog(pMac, LOGE, FL(" %s fail to start timer status %d"), __func__, status);
          //Without the timer we cannot continue
-         csrRoamCallCallback((tpAniSirGlobal)pP2pContext->hHal, 
-                     pP2pContext->SMEsessionId, &RoamInfo, 0, 
-                     eCSR_ROAM_SEND_ACTION_CNF, 
+         csrRoamCallCallback((tpAniSirGlobal)pP2pContext->hHal,
+                     pP2pContext->SMEsessionId, &RoamInfo, 0,
+                     eCSR_ROAM_SEND_ACTION_CNF,
                      eCSR_ROAM_RESULT_SEND_ACTION_FAIL);
          vos_spin_lock_acquire(&pP2pContext->lState);
          pBuf = pP2pContext->pSentActionFrame;
@@ -1509,12 +1509,12 @@ void p2pListenDiscoverTimerHandler(void *pContext)
    tp2pContext *p2pContext = (tp2pContext*) pContext;
    eHalStatus status = eHAL_STATUS_SUCCESS;
 
-   if( (eP2P_STATE_DISCONNECTED == p2pContext->state) && 
+   if( (eP2P_STATE_DISCONNECTED == p2pContext->state) &&
        (eStateDisabled != p2pContext->listenDiscoverableState) )
    {
       VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Calling RemainOnChannel with duration %d on channel %d",
              __func__, p2pContext->listenDuration, p2pContext->P2PListenChannel);
-      status = p2pRemainOnChannel( p2pContext->hHal, p2pContext->SMEsessionId, p2pContext->P2PListenChannel, p2pContext->listenDuration, 
+      status = p2pRemainOnChannel( p2pContext->hHal, p2pContext->SMEsessionId, p2pContext->P2PListenChannel, p2pContext->listenDuration,
                                     p2pListenStateDiscoverableCallback, p2pContext, TRUE, eP2PRemainOnChnReasonListen);
    }
    else
@@ -1532,8 +1532,8 @@ static eHalStatus p2pListenStateDiscoverableCallback(tHalHandle halHandle, void
    tpAniSirGlobal pMac = PMAC_STRUCT(halHandle);
    tp2pContext *p2pContext = (tp2pContext*) pContext;
 
-   if( (eP2P_STATE_DISCONNECTED == p2pContext->state) && 
-       (eStateDisabled != p2pContext->listenDiscoverableState) && 
+   if( (eP2P_STATE_DISCONNECTED == p2pContext->state) &&
+       (eStateDisabled != p2pContext->listenDiscoverableState) &&
        (NULL == p2pContext->p2pDiscoverCBFunc) )
    {
       VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s restart listen timer expire time %d",
@@ -1562,7 +1562,7 @@ eHalStatus P2P_ListenStateDiscoverable(tHalHandle hHal, tANI_U8 sessionId,
    eHalStatus status = eHAL_STATUS_SUCCESS;
    tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-   switch (listenState) 
+   switch (listenState)
    {
    case P2P_DEVICE_NOT_DISCOVERABLE:
       VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s P2P_NOT_DISCOVERABLE", __func__);
@@ -1597,8 +1597,8 @@ eHalStatus P2P_ListenStateDiscoverable(tHalHandle hHal, tANI_U8 sessionId,
       {
          VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Calling RemainOnChannel with diration %d on channel %d",
                      __func__, pMac->p2pContext[sessionId].listenDuration, pMac->p2pContext[sessionId].P2PListenChannel);
-         p2pRemainOnChannel( pMac, pMac->p2pContext[sessionId].SMEsessionId, pMac->p2pContext[sessionId].P2PListenChannel, 
-                              pMac->p2pContext[sessionId].listenDuration, p2pListenStateDiscoverableCallback, 
+         p2pRemainOnChannel( pMac, pMac->p2pContext[sessionId].SMEsessionId, pMac->p2pContext[sessionId].P2PListenChannel,
+                              pMac->p2pContext[sessionId].listenDuration, p2pListenStateDiscoverableCallback,
                               &pMac->p2pContext[sessionId], TRUE, eP2PRemainOnChnReasonListen);
       }
       else
@@ -1618,8 +1618,8 @@ eHalStatus P2P_ListenStateDiscoverable(tHalHandle hHal, tANI_U8 sessionId,
       {
          VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Calling RemainOnChannel with diration %d on channel %d",
                      __func__, pMac->p2pContext[sessionId].listenDuration, pMac->p2pContext[sessionId].P2PListenChannel);
-         p2pRemainOnChannel( pMac, pMac->p2pContext[sessionId].SMEsessionId, pMac->p2pContext[sessionId].P2PListenChannel, 
-                              pMac->p2pContext[sessionId].listenDuration, p2pListenStateDiscoverableCallback, 
+         p2pRemainOnChannel( pMac, pMac->p2pContext[sessionId].SMEsessionId, pMac->p2pContext[sessionId].P2PListenChannel,
+                              pMac->p2pContext[sessionId].listenDuration, p2pListenStateDiscoverableCallback,
                               &pMac->p2pContext[sessionId], TRUE, eP2PRemainOnChnReasonListen);
       }
       else
@@ -1639,7 +1639,7 @@ eHalStatus P2P_ListenStateDiscoverable(tHalHandle hHal, tANI_U8 sessionId,
       {
          pMac->p2pContext[sessionId].expire_time = P2P_LISTEN_TIMEOUT_HIGH * PAL_TIMER_TO_MS_UNIT * 5;
          pMac->p2pContext[sessionId].listenDuration = P2P_REMAIN_ON_CHAN_TIMEOUT_LOW;
-      } 
+      }
       else
       {
          pMac->p2pContext[sessionId].expire_time = P2P_LISTEN_TIMEOUT_HIGH * PAL_TIMER_TO_MS_UNIT;
@@ -1650,15 +1650,15 @@ eHalStatus P2P_ListenStateDiscoverable(tHalHandle hHal, tANI_U8 sessionId,
       {
          VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Calling RemainOnChannel with diration %d on channel %d",
                      __func__, pMac->p2pContext[sessionId].listenDuration, pMac->p2pContext[sessionId].P2PListenChannel);
-         p2pRemainOnChannel( pMac, pMac->p2pContext[sessionId].SMEsessionId, pMac->p2pContext[sessionId].P2PListenChannel, 
-                              pMac->p2pContext[sessionId].listenDuration, p2pListenStateDiscoverableCallback, 
+         p2pRemainOnChannel( pMac, pMac->p2pContext[sessionId].SMEsessionId, pMac->p2pContext[sessionId].P2PListenChannel,
+                              pMac->p2pContext[sessionId].listenDuration, p2pListenStateDiscoverableCallback,
                               &pMac->p2pContext[sessionId], TRUE, eP2PRemainOnChnReasonListen);
       }
-      
+
       break;
 
    default:
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
          "%s Unknown listen setting",__func__, listenState);
       break;
    }
@@ -1685,7 +1685,7 @@ void p2pDiscoverTimerHandler(void *pContext)
    eHalStatus status = eHAL_STATUS_SUCCESS;
 
    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s enter", __func__);
-   p2pCallDiscoverCallback(p2pContext, 
+   p2pCallDiscoverCallback(p2pContext,
          (p2pContext->directedDiscovery) ? eP2P_DIRECTED_DISCOVER : eP2P_DISCOVER_SUCCESS);
 
    status = p2pFsm(p2pContext, eP2P_TRIGGER_DISCONNECTED);
@@ -1717,8 +1717,8 @@ eHalStatus p2pGetResultFilter(tp2pContext *pP2pContext,
             {
                pFilter->BSSIDs.numOfBSSIDs++;
             }
-            
-            if ((directedDiscoveryFilter->ucBitmask != QCWLAN_P2P_DISCOVER_ANY) 
+
+            if ((directedDiscoveryFilter->ucBitmask != QCWLAN_P2P_DISCOVER_ANY)
                && (directedDiscoveryFilter->ucBitmask & DISCOVERY_FILTER_BITMASK_GO))
             {
                //Matching Device ID and GroupSSID
@@ -1738,7 +1738,7 @@ eHalStatus p2pGetResultFilter(tp2pContext *pP2pContext,
                        sizeof( tCsrBssid ) * pFilter->BSSIDs.numOfBSSIDs );
             if (NULL == bssid)
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                   " %s fail to allocate bssid", __func__);
                status = eHAL_STATUS_RESOURCES;
                break;
@@ -1762,7 +1762,7 @@ eHalStatus p2pGetResultFilter(tp2pContext *pP2pContext,
                     sizeof( *pFilter->SSIDs.SSIDList ) * pFilter->SSIDs.numOfSSIDs );
             if (NULL == pFilter->SSIDs.SSIDList)
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                   " %s fail to allocate bssid", __func__);
                status = eHAL_STATUS_RESOURCES;
                break;
@@ -1865,7 +1865,7 @@ eHalStatus P2P_DiscoverRequest(tHalHandle hHal,
       vos_mem_copy((tANI_U8 *)pP2pContext->DiscoverReqIeField,
                    pDiscoverRequest->pIEField, pDiscoverRequest->uIELen);
       pP2pContext->DiscoverReqIeLength = pDiscoverRequest->uIELen;
-   } 
+   }
    else
    {
       pP2pContext->DiscoverReqIeLength = 0;
@@ -1895,7 +1895,7 @@ eHalStatus P2P_DiscoverRequest(tHalHandle hHal,
                   vos_mem_malloc(sizeof(tp2pDiscoverDeviceFilter) * uNumDeviceFilters);
             if (NULL == pP2pContext->directedDiscoveryFilter)
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                   "%s fail to allocate memory for discoverFilter", __func__);
                status = eHAL_STATUS_RESOURCES;
                break;
@@ -1911,7 +1911,7 @@ eHalStatus P2P_DiscoverRequest(tHalHandle hHal,
 
             if(!HAL_STATUS_SUCCESS(status = p2pGetResultFilter(pP2pContext, &filter)))
             {
-               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+               VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                   "%s fail to create filter", __func__);
                break;
             }
@@ -1920,24 +1920,24 @@ eHalStatus P2P_DiscoverRequest(tHalHandle hHal,
          status = csrScanGetResult(pMac, &filter, &hScanResult);
          if (hScanResult)
          {
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                "%s calling p2pDiscoverCompleteCallback", __func__);
             if (callback)
             {
                callback(hHal, pContext, eP2P_DIRECTED_DISCOVER);
 
-            }       
+            }
             status =  eHAL_STATUS_SUCCESS;
             break;
          }
          else
          {
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                "%s Directed find did not find BSSID in cache", __func__);
             pP2pContext->formationReq.targetListenChannel = 0;
             if (pDiscoverRequest->uNumDeviceFilters == 1 && filter.BSSIDs.numOfBSSIDs == 1)
             {
-               vos_mem_copy(&pP2pContext->formationReq.deviceAddress, 
+               vos_mem_copy(&pP2pContext->formationReq.deviceAddress,
                             pDiscoverRequest->pDeviceFilters->DeviceID,
                             P2P_MAC_ADDRESS_LEN);
             }
@@ -1953,7 +1953,7 @@ eHalStatus P2P_DiscoverRequest(tHalHandle hHal,
       }
       else
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED,
                "%s while group formation", __func__);
       }
 
@@ -1963,7 +1963,7 @@ eHalStatus P2P_DiscoverRequest(tHalHandle hHal,
                      pP2pContext->uDiscoverTimeout);
       if (!VOS_IS_STATUS_SUCCESS(status))
       {
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
             "%s failt to start discover timer", __func__);
             pP2pContext->p2pDiscoverCBFunc = NULL;
             pP2pContext->pContext          = NULL;
@@ -1996,7 +1996,7 @@ eHalStatus p2pScanRequest(tp2pContext *p2pContext, p2pDiscoverCompleteCallback c
    v_U32_t scanId = 0;
    tANI_U32 len = 0;
    tCsrSSIDInfo wcSSID = { {P2P_WILDCARD_SSID_LEN, P2P_WILDCARD_SSID}, 0, 0 };
-   tANI_U8 Channel; 
+   tANI_U8 Channel;
    eHalStatus status = eHAL_STATUS_SUCCESS;
    tP2P_OperatingChannel p2pOperatingChannel;
    tpAniSirGlobal pMac = PMAC_STRUCT(p2pContext->hHal);
@@ -2007,10 +2007,10 @@ eHalStatus p2pScanRequest(tp2pContext *p2pContext, p2pDiscoverCompleteCallback c
 
    P2P_GetOperatingChannel(p2pContext->hHal, p2pContext->sessionId, &p2pOperatingChannel);
    Channel = p2pOperatingChannel.channel;
-   
+
    if (Channel)
    {
-      scanRequest.ChannelInfo.numOfChannels = 1;      
+      scanRequest.ChannelInfo.numOfChannels = 1;
       scanRequest.ChannelInfo.ChannelList = &Channel;
       VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s Scan on channel %d p2pContext->sessionId %d",
                   __func__, Channel, p2pContext->sessionId);
@@ -2038,7 +2038,7 @@ eHalStatus p2pScanRequest(tp2pContext *p2pContext, p2pDiscoverCompleteCallback c
    scanRequest.SSIDs.numOfSSIDs = 1;
    scanRequest.SSIDs.SSIDList = &wcSSID;
    scanRequest.p2pSearch = VOS_FALSE;
-       
+
    P2P_GetIE(p2pContext, p2pContext->sessionId, eP2P_GROUP_ID, &p2pIe, &p2pIeLen);
    vos_mem_copy(scanRequest.bssid, ((tP2PGroupId *)p2pIe)->deviceAddress,
                 P2P_MAC_ADDRESS_LEN);
@@ -2073,7 +2073,7 @@ tANI_U8 getP2PSessionIdFromSMESessionId(tHalHandle hHal, tANI_U8 SessionID)
          return pMac->p2pContext[num_session].sessionId;
       }
    }
-   
+
    return CSR_SESSION_ID_INVALID;
 }
 
@@ -2134,7 +2134,7 @@ eHalStatus p2pGetListenChannel(tHalHandle hHal, tANI_U8 SessionID, tANI_U8 *chan
    tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
    *channel = pMac->p2pContext[SessionID].P2PListenChannel;
-  
+
    return eHAL_STATUS_SUCCESS;
 }
 
@@ -2153,11 +2153,11 @@ eHalStatus p2pSetListenChannel(tHalHandle hHal, tANI_U8 SessionID, tANI_U8 chann
    }
    else
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
          " %s fail with invalid channel %d", __func__, channel);
       status = eHAL_STATUS_INVALID_PARAMETER;
    }
-  
+
    return status;
 }
 
@@ -2190,9 +2190,9 @@ eHalStatus p2pPurgeDeviceList(tpAniSirGlobal pMac, tDblLinkList *pList)
    tListElem *pEntry, *pNext;
    tCsrScanResult *pBssResult;
    tDot11fBeaconIEs *pIes;
-    
+
    csrLLLock(pList);
-   
+
    pEntry = csrLLPeekHead(pList, LL_ACCESS_NOLOCK);
    while( NULL != pEntry )
    {
@@ -2311,10 +2311,6 @@ eHalStatus p2pProcessNoAReq(tpAniSirGlobal pMac, tSmeCmd *pNoACmd)
         msg.bodyval = 0;
         msg.bodyptr = pNoA;
         limPostMsgApi(pMac, &msg);
-    }   
+    }
     return status;
 }
-
-
-
-
diff --git a/CORE/SME/src/pmc/pmc.c b/CORE/SME/src/pmc/pmc.c
index dd2197c66b14..d89e6c3d91f5 100644
--- a/CORE/SME/src/pmc/pmc.c
+++ b/CORE/SME/src/pmc/pmc.c
@@ -2599,7 +2599,7 @@ eHalStatus pmcEnterBmpsCheck( tpAniSirGlobal pMac )
       return eHAL_STATUS_PMC_NOT_NOW;
    }
 
-    //Remove this code once SLM_Sessionization is supported 
+    //Remove this code once SLM_Sessionization is supported
     //BMPS_WORKAROUND_NOT_NEEDED
     if(!IS_FEATURE_SUPPORTED_BY_FW(SLM_SESSIONIZATION))
     {
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index 3ab8fbdecbe4..b9cb962bd6e2 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -109,14 +109,14 @@ eHalStatus pmcOpen (tHalHandle hHal)
 
     /* Allocate a timer used in Full Power State to measure traffic
        levels and determine when to enter BMPS. */
-    if (!VOS_IS_STATUS_SUCCESS(vos_timer_init(&pMac->pmc.hTrafficTimer, 
+    if (!VOS_IS_STATUS_SUCCESS(vos_timer_init(&pMac->pmc.hTrafficTimer,
                                 VOS_TIMER_TYPE_SW, pmcTrafficTimerExpired, hHal)))
     {
         pmcLog(pMac, LOGE, FL("Cannot allocate timer for traffic measurement"));
         return eHAL_STATUS_FAILURE;
     }
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
     /* Allocate a timer used to report current PMC state through periodic DIAG event */
     if (vos_timer_init(&pMac->pmc.hDiagEvtTimer, VOS_TIMER_TYPE_SW, pmcDiagEvtTimerExpired, hHal) != VOS_STATUS_SUCCESS)
     {
@@ -125,7 +125,7 @@ eHalStatus pmcOpen (tHalHandle hHal)
     }
 #endif
 
-    //Initialize the default value for Bmps related config. 
+    //Initialize the default value for Bmps related config.
     pMac->pmc.bmpsConfig.trafficMeasurePeriod = BMPS_TRAFFIC_TIMER_DEFAULT;
     pMac->pmc.bmpsConfig.bmpsPeriod = WNI_CFG_LISTEN_INTERVAL_STADEF;
 
@@ -137,7 +137,7 @@ eHalStatus pmcOpen (tHalHandle hHal)
         PMC_ABORT;
         return eHAL_STATUS_FAILURE;
     }
-    
+
     /* Initialize lists for power save check routines and request full power callback routines. */
     if (csrLLOpen(pMac->hHdd, &pMac->pmc.powerSaveCheckList) != eHAL_STATUS_SUCCESS)
     {
@@ -247,12 +247,12 @@ eHalStatus pmcStart (tHalHandle hHal)
     }
     else
         htMimoPowerSaveState = eSIR_HT_MIMO_PS_NO_LIMIT;
-    
+
     if (pmcSendMessage(hHal, eWNI_PMC_SMPS_STATE_IND, &htMimoPowerSaveState,
                        sizeof(tSirMacHTMIMOPowerSaveState)) != eHAL_STATUS_SUCCESS)
         return eHAL_STATUS_FAILURE;
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT 
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
     if (pmcStartDiagEvtTimer(hHal) != eHAL_STATUS_SUCCESS)
     {
        return eHAL_STATUS_FAILURE;
@@ -298,7 +298,7 @@ eHalStatus pmcStop (tHalHandle hHal)
 
     pmcStopTrafficTimer(hHal);
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
     pmcStopDiagEvtTimer(hHal);
 #endif
 
@@ -361,7 +361,7 @@ eHalStatus pmcClose (tHalHandle hHal)
     {
         pmcLog(pMac, LOGE, FL("Cannot deallocate traffic timer"));
     }
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
     if (vos_timer_destroy(&pMac->pmc.hDiagEvtTimer) != VOS_STATUS_SUCCESS)
     {
         pmcLog(pMac, LOGE, FL("Cannot deallocate timer for diag event reporting"));
@@ -373,7 +373,7 @@ eHalStatus pmcClose (tHalHandle hHal)
     }
 
     /*
-        The following list's entries are dynamically allocated so they need their own 
+        The following list's entries are dynamically allocated so they need their own
         cleanup function
     */
     pmcClosePowerSaveCheckList(pMac);
@@ -449,7 +449,7 @@ eHalStatus pmcSignalPowerEvent (tHalHandle hHal, tPmcPowerEvent event)
             if (pMac->pmc.smpsConfig.mode == ePMC_STATIC_SMPS)
                 htMimoPowerSaveState = eSIR_HT_MIMO_PS_STATIC;
             if (pmcSendMessage(hHal, eWNI_PMC_SMPS_STATE_IND, &htMimoPowerSaveState,
-                               sizeof(tSirMacHTMIMOPowerSaveState)) != eHAL_STATUS_SUCCESS)   
+                               sizeof(tSirMacHTMIMOPowerSaveState)) != eHAL_STATUS_SUCCESS)
                 return eHAL_STATUS_FAILURE;
         }
         return eHAL_STATUS_SUCCESS;
@@ -506,7 +506,7 @@ eHalStatus pmcSetConfigPowerSave (tHalHandle hHal, tPmcPowerSavingMode psMode, v
     /* Configure the specified power saving mode. */
     switch (psMode)
     {
-    
+
     case ePMC_IDLE_MODE_POWER_SAVE:
         pMac->pmc.impsConfig = *(tpPmcImpsConfigParams)pConfigParams;
         pmcLog(pMac, LOG3, FL("IMPS configuration"));
@@ -540,13 +540,13 @@ eHalStatus pmcSetConfigPowerSave (tHalHandle hHal, tPmcPowerSavingMode psMode, v
         pmcLog(pMac, LOG3, "          value of bcnEarlyTermWakeInterval: %d",
                pMac->pmc.bmpsConfig.bcnEarlyTermWakeInterval);
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
         vos_mem_zero(&psRequest, sizeof(vos_event_wlan_powersave_payload_type));
         psRequest.event_subtype = WLAN_BMPS_SET_CONFIG;
         /* possible loss of data due to mismatch but expectation is that
         values can reasonably be expected to fit in target widths */
         psRequest.bmps_auto_timer_duration = (v_U16_t)pMac->pmc.bmpsConfig.trafficMeasurePeriod;
-        psRequest.bmps_period = (v_U16_t)pMac->pmc.bmpsConfig.bmpsPeriod; 
+        psRequest.bmps_period = (v_U16_t)pMac->pmc.bmpsConfig.bmpsPeriod;
 
         WLAN_VOS_DIAG_EVENT_REPORT(&psRequest, EVENT_WLAN_POWERSAVE_GENERIC);
 #endif
@@ -606,7 +606,7 @@ eHalStatus pmcGetConfigPowerSave (tHalHandle hHal, tPmcPowerSavingMode psMode, v
     /* Configure the specified power saving mode. */
     switch (psMode)
     {
-    
+
     case ePMC_IDLE_MODE_POWER_SAVE:
         *(tpPmcImpsConfigParams)pConfigParams = pMac->pmc.impsConfig;
         break;
@@ -647,7 +647,7 @@ eHalStatus pmcEnablePowerSave (tHalHandle hHal, tPmcPowerSavingMode psMode)
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
     tSirMacHTMIMOPowerSaveState  htMimoPowerSaveState;
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
     WLAN_VOS_DIAG_EVENT_DEF(psRequest, vos_event_wlan_powersave_payload_type);
 
     vos_mem_zero(&psRequest, sizeof(vos_event_wlan_powersave_payload_type));
@@ -656,7 +656,7 @@ eHalStatus pmcEnablePowerSave (tHalHandle hHal, tPmcPowerSavingMode psMode)
 
     WLAN_VOS_DIAG_EVENT_REPORT(&psRequest, EVENT_WLAN_POWERSAVE_GENERIC);
 #endif
-    
+
     pmcLog(pMac, LOG2, FL("Entering pmcEnablePowerSave, power save mode %d"), psMode);
 
     /* Enable the specified power saving mode. */
@@ -715,13 +715,13 @@ eHalStatus pmcEnablePowerSave (tHalHandle hHal, tPmcPowerSavingMode psMode)
             module for entry into Bmps mode. This timer is started only if BMPS is
             enabled and whenever the device is in full power.
     \param  hHal - The handle returned by macOpen.
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus pmcStartAutoBmpsTimer (tHalHandle hHal) 
+eHalStatus pmcStartAutoBmpsTimer (tHalHandle hHal)
 {
    tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
    WLAN_VOS_DIAG_EVENT_DEF(psRequest, vos_event_wlan_powersave_payload_type);
 
    vos_mem_zero(&psRequest, sizeof(vos_event_wlan_powersave_payload_type));
@@ -741,7 +741,7 @@ eHalStatus pmcStartAutoBmpsTimer (tHalHandle hHal)
 
    pMac->pmc.autoBmpsEntryEnabled = TRUE;
 
-   /* Check if there is an Infra session. If there is no Infra session, timer will be started 
+   /* Check if there is an Infra session. If there is no Infra session, timer will be started
          when STA associates to AP */
 
    if (pmcShouldBmpsTimerRun(pMac))
@@ -761,13 +761,13 @@ eHalStatus pmcStartAutoBmpsTimer (tHalHandle hHal)
             Stopping the timer does not cause a device state change. Only the timer
             is stopped. If "Full Power" is desired, use the pmcRequestFullPower API
     \param  hHal - The handle returned by macOpen.
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
 eHalStatus pmcStopAutoBmpsTimer (tHalHandle hHal)
 {
    tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
    WLAN_VOS_DIAG_EVENT_DEF(psRequest, vos_event_wlan_powersave_payload_type);
 
    vos_mem_zero(&psRequest, sizeof(vos_event_wlan_powersave_payload_type));
@@ -807,7 +807,7 @@ eHalStatus pmcDisablePowerSave (tHalHandle hHal, tPmcPowerSavingMode psMode)
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
     tSirMacHTMIMOPowerSaveState  htMimoPowerSaveState;
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
     WLAN_VOS_DIAG_EVENT_DEF(psRequest, vos_event_wlan_powersave_payload_type);
 
     vos_mem_zero(&psRequest, sizeof(vos_event_wlan_powersave_payload_type));
@@ -896,7 +896,7 @@ eHalStatus pmcQueryPowerState (tHalHandle hHal, tPmcPowerState *pPowerState,
         /* Return current power state based on PMC state. */
         switch (pMac->pmc.pmcState)
         {
-    
+
         case FULL_POWER:
             *pPowerState = ePMC_FULL_POWER;
             break;
@@ -945,7 +945,7 @@ tANI_BOOLEAN pmcIsPowerSaveEnabled (tHalHandle hHal, tPmcPowerSavingMode psMode)
     /* Check ability to enter based on the specified power saving mode. */
     switch (psMode)
     {
-    
+
     case ePMC_IDLE_MODE_POWER_SAVE:
         return pMac->pmc.impsEnabled && (pMac->pmc.powerSource != AC_POWER || pMac->pmc.impsConfig.enterOnAc);
 
@@ -1006,13 +1006,13 @@ eHalStatus pmcRequestFullPower (tHalHandle hHal, void (*callbackRoutine) (void *
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
     tpRequestFullPowerEntry pEntry;
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
     WLAN_VOS_DIAG_EVENT_DEF(psRequest, vos_event_wlan_powersave_payload_type);
 
     vos_mem_zero(&psRequest, sizeof(vos_event_wlan_powersave_payload_type));
     psRequest.event_subtype = WLAN_ENTER_FULL_POWER_REQ;
     psRequest.full_power_request_reason = fullPowerReason;
- 
+
     WLAN_VOS_DIAG_EVENT_REPORT(&psRequest, EVENT_WLAN_POWERSAVE_GENERIC);
 #endif
 
@@ -1110,7 +1110,7 @@ eHalStatus pmcRequestImps (tHalHandle hHal, tANI_U32 impsPeriod,
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
     eHalStatus status;
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
     WLAN_VOS_DIAG_EVENT_DEF(psRequest, vos_event_wlan_powersave_payload_type);
 
     vos_mem_zero(&psRequest, sizeof(vos_event_wlan_powersave_payload_type));
@@ -1443,7 +1443,7 @@ static void pmcProcessResponse( tpAniSirGlobal pMac, tSirSmeRsp *pMsg )
             }
 
          /* Enter UAPSD State if response indicates success. */
-            if (pMsg->statusCode == eSIR_SME_SUCCESS) 
+            if (pMsg->statusCode == eSIR_SME_SUCCESS)
             {
                 pmcEnterUapsdState(pMac);
                 pmcDoStartUapsdCallbacks(pMac, eHAL_STATUS_SUCCESS);
@@ -1719,7 +1719,7 @@ eHalStatus pmcRequestBmps (
    tpRequestBmpsEntry pEntry;
    eHalStatus status;
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
    WLAN_VOS_DIAG_EVENT_DEF(psRequest, vos_event_wlan_powersave_payload_type);
 
    vos_mem_zero(&psRequest, sizeof(vos_event_wlan_powersave_payload_type));
@@ -1737,7 +1737,7 @@ eHalStatus pmcRequestBmps (
       pMac->pmc.bmpsRequestedByHdd = TRUE;
       return eHAL_STATUS_SUCCESS;
    }
-   
+
    status = pmcEnterBmpsCheck( pMac );
    if(HAL_STATUS_SUCCESS( status ))
    {
@@ -1824,7 +1824,7 @@ eHalStatus pmcStartUapsd (
    tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
    tpStartUapsdEntry pEntry;
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
    WLAN_VOS_DIAG_EVENT_DEF(psRequest, vos_event_wlan_powersave_payload_type);
 
    vos_mem_zero(&psRequest, sizeof(vos_event_wlan_powersave_payload_type));
@@ -1913,7 +1913,7 @@ eHalStatus pmcStopUapsd (tHalHandle hHal)
 {
    tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
    WLAN_VOS_DIAG_EVENT_DEF(psRequest, vos_event_wlan_powersave_payload_type);
 
    vos_mem_zero(&psRequest, sizeof(vos_event_wlan_powersave_payload_type));
@@ -1949,7 +1949,7 @@ eHalStatus pmcStopUapsd (tHalHandle hHal)
     \param  hHal - The handle returned by macOpen.
     \param  callbackRoutine - Callback routine invoked in case of success/failure
     \param  callbackContext - value to be passed as parameter to callback
-    \return eHalStatus  
+    \return eHalStatus
       eHAL_STATUS_SUCCESS - device is in Standby mode
       eHAL_STATUS_FAILURE - device cannot be put in standby mode
       eHAL_STATUS_PMC_PENDING - device is being put in standby mode
@@ -1961,7 +1961,7 @@ extern eHalStatus pmcRequestStandby (
 {
    tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
    WLAN_VOS_DIAG_EVENT_DEF(psRequest, vos_event_wlan_powersave_payload_type);
 
    vos_mem_zero(&psRequest, sizeof(vos_event_wlan_powersave_payload_type));
@@ -1991,10 +1991,10 @@ extern eHalStatus pmcRequestStandby (
    if (pMac->pmc.pmcState == STANDBY)
       return eHAL_STATUS_SUCCESS;
 
-   
+
    if (csrIsIBSSStarted(pMac) || csrIsBTAMPStarted(pMac))
    {
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
           "WLAN: IBSS or BT-AMP session present. Cannot honor standby request");
       return eHAL_STATUS_PMC_NOT_NOW;
    }
@@ -2019,9 +2019,9 @@ extern eHalStatus pmcRequestStandby (
     \param  callbackContext -  Cookie to be passed back during callback
     \return eHalStatus
             eHAL_STATUS_SUCCESS - successfully registered
-            eHAL_STATUS_FAILURE - not successfully registered  
+            eHAL_STATUS_FAILURE - not successfully registered
   ---------------------------------------------------------------------------*/
-extern eHalStatus pmcRegisterDeviceStateUpdateInd (tHalHandle hHal, 
+extern eHalStatus pmcRegisterDeviceStateUpdateInd (tHalHandle hHal,
    void (*callbackRoutine) (void *callbackContext, tPmcState pmcState),
    void *callbackContext)
 {
@@ -2057,9 +2057,9 @@ extern eHalStatus pmcRegisterDeviceStateUpdateInd (tHalHandle hHal,
     \param  callbackRoutine -  Callback routine to be deregistered
     \return eHalStatus
             eHAL_STATUS_SUCCESS - successfully deregistered
-            eHAL_STATUS_FAILURE - not successfully deregistered  
+            eHAL_STATUS_FAILURE - not successfully deregistered
   ---------------------------------------------------------------------------*/
-eHalStatus pmcDeregisterDeviceStateUpdateInd (tHalHandle hHal, 
+eHalStatus pmcDeregisterDeviceStateUpdateInd (tHalHandle hHal,
    void (*callbackRoutine) (void *callbackContext, tPmcState pmcState))
 {
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -2096,7 +2096,7 @@ eHalStatus pmcDeregisterDeviceStateUpdateInd (tHalHandle hHal,
     \brief  fn to inform PMC that eWNI_SME_SYS_READY_IND has been sent to PE.
             This acts as a trigger to send a message to PE to update the power
             save related conig to FW. Note that if HDD configures any power save
-            related stuff before this API is invoked, PMC will buffer all the 
+            related stuff before this API is invoked, PMC will buffer all the
             configutaion.
     \param  hHal - The handle returned by macOpen.
     \return eHalStatus
@@ -2126,16 +2126,16 @@ eHalStatus pmcReady(tHalHandle hHal)
     \fn pmcWowlAddBcastPattern
     \brief  Add a pattern for Pattern Byte Matching in Wowl mode. Firmware will
             do a pattern match on these patterns when Wowl is enabled during BMPS
-            mode. Note that Firmware performs the pattern matching only on 
+            mode. Note that Firmware performs the pattern matching only on
             broadcast frames and while Libra is in BMPS mode.
     \param  hHal - The handle returned by macOpen.
     \param  pattern -  Pointer to the pattern to be added
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot add pattern
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
 eHalStatus pmcWowlAddBcastPattern (
-    tHalHandle hHal, 
+    tHalHandle hHal,
     tpSirWowlAddBcastPtrn pattern,
     tANI_U8 sessionId)
 {
@@ -2231,22 +2231,22 @@ skip_pmc_state_transition:
     \param  pattern -  Pattern to be deleted
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot delete pattern
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
 eHalStatus pmcWowlDelBcastPattern (
-    tHalHandle hHal, 
+    tHalHandle hHal,
     tpSirWowlDelBcastPtrn pattern,
     tANI_U8  sessionId)
 {
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
     WLAN_VOS_DIAG_EVENT_DEF(wowRequest, vos_event_wlan_powersave_wow_payload_type);
 
     vos_mem_zero(&wowRequest, sizeof(vos_event_wlan_powersave_wow_payload_type));
     wowRequest.event_subtype = WLAN_WOW_DEL_PTRN_REQ;
-    wowRequest.wow_del_ptrn_id = pattern->ucPatternId; 
+    wowRequest.wow_del_ptrn_id = pattern->ucPatternId;
 
     WLAN_VOS_DIAG_EVENT_REPORT(&wowRequest, EVENT_WLAN_POWERSAVE_WOW);
 #endif
@@ -2280,14 +2280,14 @@ eHalStatus pmcWowlDelBcastPattern (
         vos_mem_copy(pattern->bssId, pSession->connectedProfile.bssid,
                      sizeof(tSirMacAddr));
         //Wake up the chip first
-        status = pmcDeferMsg( pMac, eWNI_PMC_WOWL_DEL_BCAST_PTRN, 
+        status = pmcDeferMsg( pMac, eWNI_PMC_WOWL_DEL_BCAST_PTRN,
                                     pattern, sizeof(tSirWowlDelBcastPtrn) );
 
         if( eHAL_STATUS_PMC_PENDING == status )
         {
             return eHAL_STATUS_SUCCESS;
         }
-        else 
+        else
         {
             //either fail or already in full power
             if( !HAL_STATUS_SUCCESS( status ) )
@@ -2316,20 +2316,20 @@ skip_pmc_state_transition:
             Note 1: If "fullPowerReason" specificied in this API is set to
             eSME_FULL_PWR_NEEDED_BY_HDD, PMC will clear any "buffered wowl" requests
             and also clear any "buffered BMPS requests by HDD". Assumption is that since
-            HDD is requesting full power, we need to undo any previous HDD requests for 
+            HDD is requesting full power, we need to undo any previous HDD requests for
             BMPS (using sme_RequestBmps) or WoWL (using sme_EnterWoWL). If the reason is
             specified anything other than above, the buffered requests for BMPS and WoWL
             will not be cleared.
             Note 2: Requesting full power (no matter what the fullPowerReason is) doesn't
             disable the "auto bmps timer" (if it is enabled) or clear any "buffered uapsd
             request".
-            Note 3: When the device finally enters Full Power PMC will start a timer 
+            Note 3: When the device finally enters Full Power PMC will start a timer
             if any of the following holds true:
             - Auto BMPS mode is enabled
             - Uapsd request is pending
             - HDD's request for BMPS is pending
             - HDD's request for WoWL is pending
-            On timer expiry PMC will attempt to put the device in BMPS mode if following 
+            On timer expiry PMC will attempt to put the device in BMPS mode if following
             (in addition to those listed above) holds true:
             - Polling of all modules through the Power Save Check routine passes
             - STA is associated to an access point
@@ -2340,13 +2340,13 @@ skip_pmc_state_transition:
     \param  - wakeReasonIndCBContext -  Cookie to be passed back during callback
     \param  - fullPowerReason - Reason why this API is being invoked. SME needs to
               distinguish between BAP and HDD requests
-    \return eHalStatus - status 
+    \return eHalStatus - status
      eHAL_STATUS_SUCCESS - device brought to full power state
      eHAL_STATUS_FAILURE - device cannot be brought to full power state
      eHAL_STATUS_PMC_PENDING - device is being brought to full power state,
   ---------------------------------------------------------------------------*/
-eHalStatus pmcEnterWowl ( 
-    tHalHandle hHal, 
+eHalStatus pmcEnterWowl (
+    tHalHandle hHal,
     void (*enterWowlCallbackRoutine) (void *callbackContext, eHalStatus status),
     void *enterWowlCallbackContext,
 #ifdef WLAN_WAKEUP_EVENTS
@@ -2358,7 +2358,7 @@ eHalStatus pmcEnterWowl (
    tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
    tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
    WLAN_VOS_DIAG_EVENT_DEF(wowRequest, vos_event_wlan_powersave_wow_payload_type);
 
    vos_mem_zero(&wowRequest, sizeof(vos_event_wlan_powersave_wow_payload_type));
@@ -2464,21 +2464,21 @@ skip_pmc_state_transition:
 
 /* ---------------------------------------------------------------------------
     \fn pmcExitWowl
-    \brief  This is the SME API exposed to HDD to request exit from WoWLAN mode. 
-            SME will initiate exit from WoWLAN mode and device will be put in BMPS 
+    \brief  This is the SME API exposed to HDD to request exit from WoWLAN mode.
+            SME will initiate exit from WoWLAN mode and device will be put in BMPS
             mode.
     \param  hHal - The handle returned by macOpen.
     \param  wowlExitParams - Carries info on which smesession
                              wowl exit is requested.
     \return eHalStatus
             eHAL_STATUS_FAILURE  Device cannot exit WoWLAN mode.
-            eHAL_STATUS_SUCCESS  Request accepted to exit WoWLAN mode. 
+            eHAL_STATUS_SUCCESS  Request accepted to exit WoWLAN mode.
   ---------------------------------------------------------------------------*/
 eHalStatus pmcExitWowl (tHalHandle hHal, tpSirSmeWowlExitParams wowlExitParams)
 {
    tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT    
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
    WLAN_VOS_DIAG_EVENT_DEF(wowRequest, vos_event_wlan_powersave_wow_payload_type);
 
    vos_mem_zero(&wowRequest, sizeof(vos_event_wlan_powersave_wow_payload_type));
@@ -2512,9 +2512,9 @@ eHalStatus pmcExitWowl (tHalHandle hHal, tpSirSmeWowlExitParams wowlExitParams)
     \param  pRequest - Pointer to the offload request.
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot set the offload.
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
-eHalStatus pmcSetHostOffload (tHalHandle hHal, tpSirHostOffloadReq pRequest, 
+eHalStatus pmcSetHostOffload (tHalHandle hHal, tpSirHostOffloadReq pRequest,
                                    tANI_U8 sessionId)
 {
     tpSirHostOffloadReq pRequestBuf;
@@ -2564,7 +2564,7 @@ eHalStatus pmcSetHostOffload (tHalHandle hHal, tpSirHostOffloadReq pRequest,
     \param  pRequest - Pointer to the Keep Alive.
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot set the keepalive.
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
 eHalStatus pmcSetKeepAlive (tHalHandle hHal, tpSirKeepAliveReq pRequest, tANI_U8 sessionId)
 {
@@ -2623,9 +2623,9 @@ eHalStatus pmcSetKeepAlive (tHalHandle hHal, tpSirKeepAliveReq pRequest, tANI_U8
     \param  pRequest - Pointer to the offload request.
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot set the offload.
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
-eHalStatus pmcSetNSOffload (tHalHandle hHal, tpSirHostOffloadReq pRequest, 
+eHalStatus pmcSetNSOffload (tHalHandle hHal, tpSirHostOffloadReq pRequest,
                                  tANI_U8 sessionId)
 {
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -2639,7 +2639,7 @@ eHalStatus pmcSetNSOffload (tHalHandle hHal, tpSirHostOffloadReq pRequest,
         return eHAL_STATUS_FAILURE;
     }
 
-    vos_mem_copy(pRequest->bssId, pSession->connectedProfile.bssid, 
+    vos_mem_copy(pRequest->bssId, pSession->connectedProfile.bssid,
                 sizeof(tSirMacAddr));
 
     pRequestBuf = vos_mem_malloc(sizeof(tSirHostOffloadReq));
@@ -2764,7 +2764,7 @@ void pmcCloseDeferredMsgList(tpAniSirGlobal pMac)
 
 #ifdef FEATURE_WLAN_SCAN_PNO
 
-static tSirRetStatus 
+static tSirRetStatus
 pmcPopulateMacHeader( tpAniSirGlobal pMac,
                       tANI_U8* pBD,
                       tANI_U8 type,
@@ -2774,7 +2774,7 @@ pmcPopulateMacHeader( tpAniSirGlobal pMac,
 {
     tSirRetStatus   statusCode = eSIR_SUCCESS;
     tpSirMacMgmtHdr pMacHdr;
-    
+
     /// Prepare MAC management header
     pMacHdr = (tpSirMacMgmtHdr) (pBD);
 
@@ -2822,7 +2822,7 @@ pmcPrepareProbeReqTemplate(tpAniSirGlobal pMac,
         PopulateDot11fExtSuppRates1( pMac, nChannelNum, &pr.ExtSuppRates );
     }
 
-    
+
     if (IS_DOT11_MODE_HT(dot11mode))
     {
        PopulateDot11fHTCaps( pMac, NULL, &pr.HTCaps );
@@ -2833,7 +2833,7 @@ pmcPrepareProbeReqTemplate(tpAniSirGlobal pMac,
            pr.HTCaps.shortGI20MHz = pr.HTCaps.shortGI40MHz = 0;
        }
     }
-    
+
     // That's it-- now we pack it.  First, how much space are we going to
     // need?
     nStatus = dot11fGetPackedProbeRequestSize( pMac, &pr, &nPayload );
@@ -2855,7 +2855,7 @@ pmcPrepareProbeReqTemplate(tpAniSirGlobal pMac,
     }
 
     nBytes = nPayload + sizeof( tSirMacMgmtHdr );
-  
+
     /* Prepare outgoing frame*/
     vos_mem_set(pFrame, nBytes, 0);
 
@@ -2883,21 +2883,21 @@ pmcPrepareProbeReqTemplate(tpAniSirGlobal pMac,
     }
     else if ( DOT11F_WARNED( nStatus ) )
     {
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
             "There were warnings while packing a Probe Request" );
     }
 
-    *pusLen = nPayload + sizeof(tSirMacMgmtHdr); 
+    *pusLen = nPayload + sizeof(tSirMacMgmtHdr);
     return eSIR_SUCCESS;
 } // End pmcPrepareProbeReqTemplate.
 
 
 eHalStatus pmcSetPreferredNetworkList
 (
-    tHalHandle hHal, 
-    tpSirPNOScanReq pRequest, 
-    tANI_U8 sessionId, 
-    preferredNetworkFoundIndCallback callbackRoutine, 
+    tHalHandle hHal,
+    tpSirPNOScanReq pRequest,
+    tANI_U8 sessionId,
+    preferredNetworkFoundIndCallback callbackRoutine,
     void *callbackContext
 )
 {
@@ -2950,7 +2950,7 @@ eHalStatus pmcSetPreferredNetworkList
     vos_mem_copy(pRequestBuf, pRequest, sizeof(tSirPNOScanReq));
 
     /*Must translate the mode first*/
-    ucDot11Mode = (tANI_U8) csrTranslateToWNICfgDot11Mode(pMac, 
+    ucDot11Mode = (tANI_U8) csrTranslateToWNICfgDot11Mode(pMac,
                                        csrFindBestPhyMode( pMac, pMac->roam.configParam.phyMode ));
 
     /*Prepare a probe request for 2.4GHz band and one for 5GHz band*/
@@ -3052,7 +3052,7 @@ eHalStatus pmcSetRssiFilter(tHalHandle hHal,   v_U8_t        rssiThreshold)
     }
 
 
-    pRequestBuf->rssiThreshold = rssiThreshold; 
+    pRequestBuf->rssiThreshold = rssiThreshold;
 
     msg.type = WDA_SET_RSSI_FILTER_REQ;
     msg.reserved = 0;
@@ -3083,18 +3083,18 @@ eHalStatus pmcUpdateScanParams(tHalHandle hHal, tCsrConfig *pRequest, tCsrChanne
         return eHAL_STATUS_FAILED_ALLOC;
     }
 
-    // 
+    //
     // Fill pRequestBuf structure from pRequest
     //
     pRequestBuf->b11dEnabled    = pRequest->Is11eSupportEnabled;
     pRequestBuf->b11dResolved   = b11dResolved;
-    pRequestBuf->ucChannelCount = 
+    pRequestBuf->ucChannelCount =
         ( pChannelList->numChannels < SIR_PNO_MAX_NETW_CHANNELS_EX )?
         pChannelList->numChannels:SIR_PNO_MAX_NETW_CHANNELS_EX;
 
     for (i=0; i < pRequestBuf->ucChannelCount; i++)
-    {    
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+    {
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
                   "%s: Channel List %d: %d", __FUNCTION__, i, pChannelList->channelList[i] );
 
         pRequestBuf->aChannels[i] = pChannelList->channelList[i];
@@ -3102,7 +3102,7 @@ eHalStatus pmcUpdateScanParams(tHalHandle hHal, tCsrConfig *pRequest, tCsrChanne
     pRequestBuf->usPassiveMinChTime = pRequest->nPassiveMinChnTime;
     pRequestBuf->usPassiveMaxChTime = pRequest->nPassiveMaxChnTime;
     pRequestBuf->usActiveMinChTime  = pRequest->nActiveMinChnTime;
-    pRequestBuf->usActiveMaxChTime  = pRequest->nActiveMaxChnTime; 
+    pRequestBuf->usActiveMaxChTime  = pRequest->nActiveMaxChnTime;
     pRequestBuf->ucCBState          = PHY_SINGLE_CHANNEL_CENTERED;
 
     msg.type = WDA_UPDATE_SCAN_PARAMS_REQ;
@@ -3140,7 +3140,7 @@ eHalStatus pmcSetPowerParams(tHalHandle hHal,   tSirSetPowerParamsReq*  pwParams
     }
 
 
-    vos_mem_copy(pRequestBuf, pwParams, sizeof(*pRequestBuf)); 
+    vos_mem_copy(pRequestBuf, pwParams, sizeof(*pRequestBuf));
 
 
     msg.type = WDA_SET_POWER_PARAMS_REQ;
@@ -3160,8 +3160,8 @@ eHalStatus pmcSetPowerParams(tHalHandle hHal,   tSirSetPowerParamsReq*  pwParams
 #ifdef WLAN_FEATURE_PACKET_FILTERING
 eHalStatus pmcGetFilterMatchCount
 (
-    tHalHandle hHal, 
-    FilterMatchCountCallback callbackRoutine, 
+    tHalHandle hHal,
+    FilterMatchCountCallback callbackRoutine,
     void *callbackContext,
     tANI_U8  sessionId
 )
@@ -3171,7 +3171,7 @@ eHalStatus pmcGetFilterMatchCount
     tpAniSirGlobal          pMac = PMAC_STRUCT(hHal);
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
 
-    VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+    VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
         "%s", __func__);
 
     if(NULL == pSession )
@@ -3200,9 +3200,9 @@ eHalStatus pmcGetFilterMatchCount
     /* Cache the Packet Coalescing Filter Match Count callback information */
     if (NULL != pMac->pmc.FilterMatchCountCB)
     {
-        // Do we need to check if the callback is in use? 
+        // Do we need to check if the callback is in use?
         // Because we are not sending the same message again when it is pending,
-        // the only case when the callback is not NULL is that the previous message 
+        // the only case when the callback is not NULL is that the previous message
         //was timed out or failed.
         // So, it will be safe to set the callback in this case.
     }
@@ -3212,7 +3212,7 @@ eHalStatus pmcGetFilterMatchCount
 
     if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
     {
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
             "%s: Not able to post WDA_PACKET_COALESCING_FILTER_MATCH_COUNT_REQ "
             "message to WDA", __func__);
         vos_mem_free(pRequestBuf);
@@ -3231,9 +3231,9 @@ eHalStatus pmcGetFilterMatchCount
     \param  pGtkOffload - Pointer to the GTK offload request.
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot set the offload.
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
-eHalStatus pmcSetGTKOffload (tHalHandle hHal, tpSirGtkOffloadParams pGtkOffload, 
+eHalStatus pmcSetGTKOffload (tHalHandle hHal, tpSirGtkOffloadParams pGtkOffload,
                                   tANI_U8 sessionId)
 {
     tpSirGtkOffloadParams pRequestBuf;
@@ -3285,9 +3285,9 @@ eHalStatus pmcSetGTKOffload (tHalHandle hHal, tpSirGtkOffloadParams pGtkOffload,
     \param  callbackRoutine - Pointer to the GTK Offload Get Info response callback routine.
     \return eHalStatus
             eHAL_STATUS_FAILURE  Cannot set the offload.
-            eHAL_STATUS_SUCCESS  Request accepted. 
+            eHAL_STATUS_SUCCESS  Request accepted.
   ---------------------------------------------------------------------------*/
-eHalStatus pmcGetGTKOffload(tHalHandle hHal, GTKOffloadGetInfoCallback callbackRoutine, 
+eHalStatus pmcGetGTKOffload(tHalHandle hHal, GTKOffloadGetInfoCallback callbackRoutine,
                                   void *callbackContext, tANI_U8 sessionId)
 {
     tpSirGtkOffloadGetInfoRspParams  pRequestBuf;
@@ -3300,7 +3300,7 @@ eHalStatus pmcGetGTKOffload(tHalHandle hHal, GTKOffloadGetInfoCallback callbackR
 
     if(NULL == pSession )
     {
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                   "%s: Session not found ", __func__);
         return eHAL_STATUS_FAILURE;
     }
@@ -3314,7 +3314,7 @@ eHalStatus pmcGetGTKOffload(tHalHandle hHal, GTKOffloadGetInfoCallback callbackR
         return eHAL_STATUS_FAILED_ALLOC;
     }
 
-    vos_mem_copy(pRequestBuf->bssId, pSession->connectedProfile.bssid, sizeof(tSirMacAddr)); 
+    vos_mem_copy(pRequestBuf->bssId, pSession->connectedProfile.bssid, sizeof(tSirMacAddr));
 
     msg.type = WDA_GTK_OFFLOAD_GETINFO_REQ;
     msg.reserved = 0;
@@ -3323,7 +3323,7 @@ eHalStatus pmcGetGTKOffload(tHalHandle hHal, GTKOffloadGetInfoCallback callbackR
     /* Cache the Get GTK Offload callback information */
     if (NULL != pMac->pmc.GtkOffloadGetInfoCB)
     {
-        // Do we need to check if the callback is in use? 
+        // Do we need to check if the callback is in use?
         // Because we are not sending the same message again when it is pending,
         // the only case when the callback is not NULL is that the previous message was timed out or failed.
         // So, it will be safe to set the callback in this case.
@@ -3334,7 +3334,7 @@ eHalStatus pmcGetGTKOffload(tHalHandle hHal, GTKOffloadGetInfoCallback callbackR
 
     if (!VOS_IS_STATUS_SUCCESS(vos_mq_post_message(VOS_MODULE_ID_WDA, &msg)))
     {
-        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_GTK_OFFLOAD_GETINFO_REQ message to WDA", 
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_GTK_OFFLOAD_GETINFO_REQ message to WDA",
                     __func__);
         vos_mem_free(pRequestBuf);
         return eHAL_STATUS_FAILURE;
@@ -4356,4 +4356,3 @@ eHalStatus PmcOffloadDisableDeferredStaModePowerSave(tHalHandle hHal,
     pmc->configDefStaPsEnabled = FALSE;
     return eHAL_STATUS_SUCCESS;
 }
-
diff --git a/CORE/SME/src/pmc/pmcLogDump.c b/CORE/SME/src/pmc/pmcLogDump.c
index 724b0630ee70..264a4bfcfb69 100644
--- a/CORE/SME/src/pmc/pmcLogDump.c
+++ b/CORE/SME/src/pmc/pmcLogDump.c
@@ -233,7 +233,7 @@ dump_pmc_enter_wowl( tpAniSirGlobal pMac, tANI_U32 arg1, tANI_U32 arg2, tANI_U32
         wowlEnterParams.ucMagicPktEnable = 1;
         /* magic packet */
         length = SIR_MAC_ADDR_LENGTH;
-        status = wlan_cfgGetStr(pMac, WNI_CFG_STA_ID, (tANI_U8 *)wowlEnterParams.magicPtrn, &length); 
+        status = wlan_cfgGetStr(pMac, WNI_CFG_STA_ID, (tANI_U8 *)wowlEnterParams.magicPtrn, &length);
         if (eSIR_SUCCESS != status)
         {
             pmcLog(pMac, LOGE,
@@ -261,7 +261,7 @@ dump_pmc_enter_wowl( tpAniSirGlobal pMac, tANI_U32 arg1, tANI_U32 arg2, tANI_U32
 
     sessionId = (tANI_U8 ) arg3;
 #ifdef WLAN_WAKEUP_EVENTS
-    (void)sme_EnterWowl(pMac, dump_pmc_callbackRoutine, pMac, dump_pmc_callbackRoutine2, pMac, 
+    (void)sme_EnterWowl(pMac, dump_pmc_callbackRoutine, pMac, dump_pmc_callbackRoutine2, pMac,
                         &wowlEnterParams, sessionId);
 #else // WLAN_WAKEUP_EVENTS
     (void)sme_EnterWowl(pMac, dump_pmc_callbackRoutine, pMac, &wowlEnterParams, sessionId);
@@ -285,7 +285,7 @@ dump_pmc_remove_ptrn( tpAniSirGlobal pMac, tANI_U32 arg1, tANI_U32 arg2, tANI_U3
     tSirWowlDelBcastPtrn delPattern;
     tANI_U8  sessionId = 0;
     (void) arg3; (void) arg4;
- 
+
     vos_mem_set(&delPattern, sizeof(tSirWowlDelBcastPtrn), 0);
 
     if((arg1 <= 7) || (arg2 == CSR_ROAM_SESSION_MAX))
@@ -361,7 +361,7 @@ dump_pmc_test_Wowl( tpAniSirGlobal pMac, tANI_U32 arg1, tANI_U32 arg2, tANI_U32
 
     //Enter Wowl
 #ifdef WLAN_WAKEUP_EVENTS
-    sme_EnterWowl(pMac, dump_pmc_callbackRoutine, pMac, dump_pmc_callbackRoutine2, pMac, 
+    sme_EnterWowl(pMac, dump_pmc_callbackRoutine, pMac, dump_pmc_callbackRoutine2, pMac,
                    &wowlEnterParams, sessionId);
 #else // WLAN_WAKEUP_EVENTS
     sme_EnterWowl(pMac, dump_pmc_callbackRoutine, pMac, &wowlEnterParams, sessionId);
diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c
index ac56da3b1e28..51a99d69c14c 100644
--- a/CORE/SME/src/rrm/sme_rrm.c
+++ b/CORE/SME/src/rrm/sme_rrm.c
@@ -27,11 +27,11 @@
 
 
 /**=========================================================================
-  
+
   \file  sme_Rrm.c
-  
+
   \brief implementation for SME RRM APIs
-  
+
   ========================================================================*/
 
 /* $Header$ */
@@ -76,46 +76,46 @@
 #define RRM_ROAM_SCORE_NEIGHBOR_IAPP_LIST                       30
 #endif
 /**---------------------------------------------------------------------------
-  
-  \brief rrmLLPurgeNeighborCache() - 
-    This function purges all the entries in the neighbor cache and frees up all the internal nodes   
+
+  \brief rrmLLPurgeNeighborCache() -
+    This function purges all the entries in the neighbor cache and frees up all the internal nodes
 
   \param  - pMac  - Pointer to the Hal Handle.
           - pList - Pointer the List that should be purged.
   \return - void
-  
+
   --------------------------------------------------------------------------*/
 static void rrmLLPurgeNeighborCache(tpAniSirGlobal pMac, tDblLinkList *pList)
 {
     tListElem *pEntry;
     tRrmNeighborReportDesc *pNeighborReportDesc;
-    
+
     csrLLLock(pList);
-    
+
     while((pEntry = csrLLRemoveHead(pList, LL_ACCESS_NOLOCK)) != NULL)
     {
         pNeighborReportDesc = GET_BASE_ADDR( pEntry, tRrmNeighborReportDesc, List );
         vos_mem_free(pNeighborReportDesc->pNeighborBssDescription);
         vos_mem_free(pNeighborReportDesc);
     }
-    
-    csrLLUnlock(pList);   
-     
+
+    csrLLUnlock(pList);
+
     return;
 }
 
 /**---------------------------------------------------------------------------
-  
-  \brief rrmIndicateNeighborReportResult() - 
-        This function calls the callback register by the caller while requesting for 
+
+  \brief rrmIndicateNeighborReportResult() -
+        This function calls the callback register by the caller while requesting for
         neighbor report. This function gets invoked if a neighbor report is received from an AP
         or neighbor response wait timer expires.
 
   \param  - pMac - Pointer to the Hal Handle.
-          - vosStatus - VOS_STATUS_SUCCESS/VOS_STATUS_FAILURE based on whether a valid report is 
+          - vosStatus - VOS_STATUS_SUCCESS/VOS_STATUS_FAILURE based on whether a valid report is
             received or neighbor timer expired
   \return - void
-  
+
   --------------------------------------------------------------------------*/
 void rrmIndicateNeighborReportResult(tpAniSirGlobal pMac, VOS_STATUS vosStatus)
 {
@@ -133,12 +133,12 @@ void rrmIndicateNeighborReportResult(tpAniSirGlobal pMac, VOS_STATUS vosStatus)
     }
     callback = pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.neighborRspCallback;
     callbackContext = pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.neighborRspCallbackContext;
-    
-    /* Reset the callback and the callback context before calling the callback. It is very likely that there may be a registration in 
+
+    /* Reset the callback and the callback context before calling the callback. It is very likely that there may be a registration in
             callback itself. */
     pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.neighborRspCallback = NULL;
     pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.neighborRspCallbackContext = NULL;
-    
+
     /* Call the callback with the status received from caller */
     if (callback)
         callback(callbackContext, vosStatus);
@@ -158,16 +158,16 @@ void rrmIndicateNeighborReportResult(tpAniSirGlobal pMac, VOS_STATUS vosStatus)
 }
 
 /**---------------------------------------------------------------------------
-  
-  \brief sme_RrmBeaconReportXmitInd() - 
+
+  \brief sme_RrmBeaconReportXmitInd() -
 
    Create and send the beacon report Xmit ind message to PE.
 
   \param  - pMac - Pointer to the Hal Handle.
               - pResult - scan result.
-              - measurementDone - flag to indicate that the measurement is done.        
+              - measurementDone - flag to indicate that the measurement is done.
   \return - 0 for success, non zero for failure
-  
+
   --------------------------------------------------------------------------*/
 static eHalStatus sme_RrmSendBeaconReportXmitInd( tpAniSirGlobal pMac,
                                                   tCsrScanResultInfo **pResultArr,
@@ -196,7 +196,7 @@ static eHalStatus sme_RrmSendBeaconReportXmitInd( tpAniSirGlobal pMac,
    if (pResultArr)
        pCurResult=pResultArr[bssCounter];
 
-   do 
+   do
    {
        length = sizeof(tSirBeaconReportXmitInd);
        pBeaconRep = vos_mem_malloc ( length );
@@ -217,7 +217,7 @@ static eHalStatus sme_RrmSendBeaconReportXmitInd( tpAniSirGlobal pMac,
        vos_mem_copy( pBeaconRep->bssId, pSmeRrmContext->sessionBssId, sizeof(tSirMacAddr) );
 
        msgCounter=0;
-       while (pCurResult) 
+       while (pCurResult)
        {
            pBssDesc = &pCurResult->BssDescriptor;
            if(pBssDesc != NULL)
@@ -252,7 +252,7 @@ static eHalStatus sme_RrmSendBeaconReportXmitInd( tpAniSirGlobal pMac,
            }
        }
 
-       bssCounter+=msgCounter; 
+       bssCounter+=msgCounter;
        if (!pResultArr || (pCurResult == NULL) || (bssCounter >= bss_count))
        {
            pCurResult = NULL;
@@ -439,8 +439,8 @@ static eHalStatus sme_CcxSendBeaconReqScanResults(tpAniSirGlobal pMac,
 #endif /* FEATURE_WLAN_CCX_UPLOAD */
 
 /**---------------------------------------------------------------------------
-  
-  \brief sme_RrmSendScanRequest() - 
+
+  \brief sme_RrmSendScanRequest() -
 
    This function is called to get the scan result from CSR and send the beacon report
    xmit ind message to PE.
@@ -448,9 +448,9 @@ static eHalStatus sme_CcxSendBeaconReqScanResults(tpAniSirGlobal pMac,
   \param  - pMac - Pointer to the Hal Handle.
               - num_chan - number of channels.
               - channel list - list of channels to fetch the result from.
-              - measurementDone - flag to indicate that the measurement is done.        
+              - measurementDone - flag to indicate that the measurement is done.
   \return - 0 for success, non zero for failure
-  
+
   --------------------------------------------------------------------------*/
 static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac,
                                          tANI_U8 num_chan,
@@ -499,9 +499,9 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac,
    }
 
    filter.ChannelInfo.numOfChannels = num_chan;
-   filter.ChannelInfo.ChannelList = chanList; 
+   filter.ChannelInfo.ChannelList = chanList;
 
-   filter.fMeasurement = TRUE; 
+   filter.fMeasurement = TRUE;
 
    csrRoamGetSessionIdFromBSSID( pMac, (tCsrBssid*)pSmeRrmContext->sessionBssId, &sessionId );
    status = sme_ScanGetResult(pMac, (tANI_U8)sessionId, &filter, &pResult);
@@ -519,7 +519,7 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac,
    {
       // no scan results
       //
-      // Spec. doesnt say anything about such condition. 
+      // Spec. doesnt say anything about such condition.
       // Since section 7.4.6.2 (IEEE802.11k-2008) says-rrm report frame should contain
       // one or more report IEs. It probably means dont send any respose if no matching
       // BSS found. Moreover, there is no flag or field in measurement report IE(7.3.2.22)
@@ -596,13 +596,13 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac,
                                                 measurementDone,
                                                 counter);
    }
-   sme_ScanResultPurge(pMac, pResult); 
+   sme_ScanResultPurge(pMac, pResult);
 
    return status;
 }
 /**---------------------------------------------------------------------------
-  
-  \brief sme_RrmScanRequestCallback() - 
+
+  \brief sme_RrmScanRequestCallback() -
 
    The sme module calls this callback function once it finish the scan request
    and this function send the beacon report xmit to PE and starts a timer of
@@ -611,9 +611,9 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac,
   \param  - halHandle - Pointer to the Hal Handle.
               - pContext - Pointer to the data context.
               - scanId - Scan ID.
-              - status - CSR Status.        
+              - status - CSR Status.
   \return - 0 for success, non zero for failure
-  
+
   --------------------------------------------------------------------------*/
 
 static eHalStatus sme_RrmScanRequestCallback(tHalHandle halHandle, void *pContext,
@@ -623,7 +623,7 @@ static eHalStatus sme_RrmScanRequestCallback(tHalHandle halHandle, void *pContex
    tANI_U16 interval;
    tpAniSirGlobal pMac = (tpAniSirGlobal) halHandle;
    tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext;
-   tANI_U32 time_tick; 
+   tANI_U32 time_tick;
 
 
 
@@ -638,7 +638,7 @@ static eHalStatus sme_RrmScanRequestCallback(tHalHandle halHandle, void *pContex
       sme_RrmSendScanResult( pMac, 1, &pSmeRrmContext->channelList.ChannelList[pSmeRrmContext->currentIndex], false );
 
       pSmeRrmContext->currentIndex++; //Advance the current index.
-      //start the timer to issue next request. 
+      //start the timer to issue next request.
       //From timer tick get a random number within 10ms and max randmization interval.
       time_tick = vos_timer_get_system_ticks();
       interval = time_tick % (pSmeRrmContext->randnIntvl - 10 + 1) + 10;
@@ -663,15 +663,15 @@ static eHalStatus sme_RrmScanRequestCallback(tHalHandle halHandle, void *pContex
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_RrmIssueScanReq() - This is called to send a scan request as part 
+  \brief sme_RrmIssueScanReq() - This is called to send a scan request as part
          of beacon report request .
-  
+
   \param  pMac  - pMac global pointer
-  
+
   \return eHAL_STATUS_SUCCESS - Validation is successful.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_RrmIssueScanReq( tpAniSirGlobal pMac )
 {
@@ -792,17 +792,17 @@ eHalStatus sme_RrmIssueScanReq( tpAniSirGlobal pMac )
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_RrmProcessBeaconReportReqInd() - This is called to process the Beacon 
+  \brief sme_RrmProcessBeaconReportReqInd() - This is called to process the Beacon
          report request from peer AP forwarded through PE .
-  
-  \param pMsgBuf - a pointer to a buffer that maps to various structures base 
+
+  \param pMsgBuf - a pointer to a buffer that maps to various structures base
                    on the message type.
                    The beginning of the buffer can always map to tSirSmeRsp.
-  
+
   \return eHAL_STATUS_SUCCESS - Validation is successful.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 void sme_RrmProcessBeaconReportReqInd(tpAniSirGlobal pMac, void *pMsgBuf)
 {
@@ -813,10 +813,10 @@ void sme_RrmProcessBeaconReportReqInd(tpAniSirGlobal pMac, void *pMsgBuf)
 #if defined WLAN_VOWIFI_DEBUG
    smsLog( pMac, LOGE, "Received Beacon report request ind Channel = %d", pBeaconReq->channelInfo.channelNum );
 #endif
-   //section 11.10.8.1 (IEEE Std 802.11k-2008) 
+   //section 11.10.8.1 (IEEE Std 802.11k-2008)
    //channel 0 and 255 has special meaning.
-   if( (pBeaconReq->channelInfo.channelNum == 0)  || 
-       ((pBeaconReq->channelInfo.channelNum == 255) && (pBeaconReq->channelList.numChannels == 0) ) ) 
+   if( (pBeaconReq->channelInfo.channelNum == 0)  ||
+       ((pBeaconReq->channelInfo.channelNum == 255) && (pBeaconReq->channelList.numChannels == 0) ) )
    {
       //Add all the channel in the regulatory domain.
       wlan_cfgGetStrLen( pMac, WNI_CFG_VALID_CHANNEL_LIST, &len );
@@ -836,7 +836,7 @@ void sme_RrmProcessBeaconReportReqInd(tpAniSirGlobal pMac, void *pMsgBuf)
 #endif
    }
    else
-   { 
+   {
       len = 0;
       pSmeRrmContext->channelList.numOfChannels = 0;
 
@@ -891,7 +891,7 @@ void sme_RrmProcessBeaconReportReqInd(tpAniSirGlobal pMac, void *pMsgBuf)
    vos_mem_copy( pSmeRrmContext->bssId, pBeaconReq->macaddrBssid, sizeof(tSirMacAddr) );
 
    //Copy ssid
-   vos_mem_copy( &pSmeRrmContext->ssId, &pBeaconReq->ssId, sizeof(tAniSSID) ); 
+   vos_mem_copy( &pSmeRrmContext->ssId, &pBeaconReq->ssId, sizeof(tAniSSID) );
 
    pSmeRrmContext->token = pBeaconReq->uDialogToken;
    pSmeRrmContext->regClass = pBeaconReq->channelInfo.regulatoryClass;
@@ -907,18 +907,18 @@ void sme_RrmProcessBeaconReportReqInd(tpAniSirGlobal pMac, void *pMsgBuf)
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_RrmNeighborReportRequest() - This is API can be used to trigger a 
+  \brief sme_RrmNeighborReportRequest() - This is API can be used to trigger a
          Neighbor report from the peer.
-  
-  \param sessionId - session identifier on which the request should be made.       
+
+  \param sessionId - session identifier on which the request should be made.
   \param pNeighborReq - a pointer to a neighbor report request.
-  
+
   \return eHAL_STATUS_SUCCESS - Validation is successful.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
-VOS_STATUS sme_RrmNeighborReportRequest(tpAniSirGlobal pMac, tANI_U8 sessionId, 
+VOS_STATUS sme_RrmNeighborReportRequest(tpAniSirGlobal pMac, tANI_U8 sessionId,
                                     tpRrmNeighborReq pNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo)
 {
    eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -929,7 +929,7 @@ VOS_STATUS sme_RrmNeighborReportRequest(tpAniSirGlobal pMac, tANI_U8 sessionId,
    smsLog( pMac, LOGE, FL("Request to send Neighbor report request received "));
 #endif
    if( !CSR_IS_SESSION_VALID( pMac, sessionId ) )
-   {  
+   {
       smsLog( pMac, LOGE, FL("Invalid session %d"), sessionId );
       return VOS_STATUS_E_INVAL;
    }
@@ -941,7 +941,7 @@ VOS_STATUS sme_RrmNeighborReportRequest(tpAniSirGlobal pMac, tANI_U8 sessionId,
        smsLog( pMac, LOGE, FL("Neighbor request already pending.. Not allowed"));
        return VOS_STATUS_E_AGAIN;
    }
-   
+
    pMsg = vos_mem_malloc ( sizeof(tSirNeighborReportReqInd) );
    if ( NULL == pMsg )
    {
@@ -949,7 +949,7 @@ VOS_STATUS sme_RrmNeighborReportRequest(tpAniSirGlobal pMac, tANI_U8 sessionId,
       return VOS_STATUS_E_NOMEM;
    }
 
-   
+
    vos_mem_zero( pMsg, sizeof(tSirNeighborReportReqInd) );
 #if defined WLAN_VOWIFI_DEBUG
    smsLog( pMac, LOGE, FL(" Allocated memory for Neighbor request") );
@@ -972,34 +972,34 @@ VOS_STATUS sme_RrmNeighborReportRequest(tpAniSirGlobal pMac, tANI_U8 sessionId,
       return VOS_STATUS_E_FAILURE;
 
    /* Neighbor report request message sent successfully to PE. Now register the callbacks */
-   pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.neighborRspCallback = 
+   pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.neighborRspCallback =
                                                             callbackInfo->neighborRspCallback;
-   pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.neighborRspCallbackContext = 
+   pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.neighborRspCallbackContext =
                                                             callbackInfo->neighborRspCallbackContext;
    pMac->rrm.rrmSmeContext.neighborReqControlInfo.isNeighborRspPending = eANI_BOOLEAN_TRUE;
 
    /* Start neighbor response wait timer now */
    vos_timer_start(&pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspWaitTimer, callbackInfo->timeout);
-   
+
    return VOS_STATUS_SUCCESS;
 }
 
 /*--------------------------------------------------------------------------
-  \brief rrmCalculateNeighborAPRoamScore() - This API is called while handling 
-                individual neighbor reports from the APs neighbor AP report to 
-                calculate the cumulative roam score before storing it in neighbor 
+  \brief rrmCalculateNeighborAPRoamScore() - This API is called while handling
+                individual neighbor reports from the APs neighbor AP report to
+                calculate the cumulative roam score before storing it in neighbor
                 cache.
-  
-  \param pNeighborReportDesc - Neighbor BSS Descriptor node for which roam score 
+
+  \param pNeighborReportDesc - Neighbor BSS Descriptor node for which roam score
                                 should be calculated
-  
+
   \return void.
 --------------------------------------------------------------------------*/
 static void rrmCalculateNeighborAPRoamScore(tpAniSirGlobal pMac, tpRrmNeighborReportDesc pNeighborReportDesc)
 {
     tpSirNeighborBssDescripton  pNeighborBssDesc;
     tANI_U32    roamScore = 0;
-    
+
     if (NULL == pNeighborReportDesc)
     {
         VOS_ASSERT(0);
@@ -1058,13 +1058,13 @@ static void rrmCalculateNeighborAPRoamScore(tpAniSirGlobal pMac, tpRrmNeighborRe
 }
 
 /*--------------------------------------------------------------------------
-  \brief rrmStoreNeighborRptByRoamScore() - This API is called to store a given 
-                        Neighbor BSS descriptor to the neighbor cache. This function 
-                        stores the neighbor BSS descriptors in such a way that descriptors 
+  \brief rrmStoreNeighborRptByRoamScore() - This API is called to store a given
+                        Neighbor BSS descriptor to the neighbor cache. This function
+                        stores the neighbor BSS descriptors in such a way that descriptors
                         are sorted by roamScore in descending order
 
   \param pNeighborReportDesc - Neighbor BSS Descriptor node to be stored in cache
-  
+
   \return void.
 --------------------------------------------------------------------------*/
 void rrmStoreNeighborRptByRoamScore(tpAniSirGlobal pMac, tpRrmNeighborReportDesc pNeighborReportDesc)
@@ -1102,7 +1102,7 @@ void rrmStoreNeighborRptByRoamScore(tpAniSirGlobal pMac, tpRrmNeighborReportDesc
             if (pTempNeighborReportDesc->roamScore < pNeighborReportDesc->roamScore)
                 break;
             pEntry = csrLLNext(&pSmeRrmContext->neighborReportCache, pEntry, LL_ACCESS_LOCK);
-        } 
+        }
 
         if (pEntry)
             /* This BSS roamscore is better than something in the list. Insert this before that one */
@@ -1115,17 +1115,17 @@ void rrmStoreNeighborRptByRoamScore(tpAniSirGlobal pMac, tpRrmNeighborReportDesc
 }
 
 /*--------------------------------------------------------------------------
-  \brief sme_RrmProcessNeighborReport() - This is called to process the Neighbor 
+  \brief sme_RrmProcessNeighborReport() - This is called to process the Neighbor
          report received from PE.
-  
-  \param pMsgBuf - a pointer to a buffer that maps to various structures base 
+
+  \param pMsgBuf - a pointer to a buffer that maps to various structures base
                    on the message type.
                    The beginning of the buffer can always map to tSirSmeRsp.
-  
+
   \return eHAL_STATUS_SUCCESS - Validation is successful.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
 eHalStatus sme_RrmProcessNeighborReport(tpAniSirGlobal pMac, void *pMsgBuf)
 {
@@ -1139,7 +1139,7 @@ eHalStatus sme_RrmProcessNeighborReport(tpAniSirGlobal pMac, void *pMsgBuf)
    // Clear the cache for CCX.
    if (csrNeighborRoamIsCCXAssoc(pMac))
    {
-       rrmLLPurgeNeighborCache(pMac, 
+       rrmLLPurgeNeighborCache(pMac,
            &pMac->rrm.rrmSmeContext.neighborReportCache);
    }
 #endif
@@ -1152,7 +1152,7 @@ eHalStatus sme_RrmProcessNeighborReport(tpAniSirGlobal pMac, void *pMsgBuf)
            smsLog( pMac, LOGE, "Failed to allocate memory for RRM Neighbor report desc");
            status = eHAL_STATUS_FAILED_ALLOC;
            goto end;
-            
+
        }
 
        vos_mem_zero(pNeighborReportDesc, sizeof(tRrmNeighborReportDesc));
@@ -1165,7 +1165,7 @@ eHalStatus sme_RrmProcessNeighborReport(tpAniSirGlobal pMac, void *pMsgBuf)
            goto end;
        }
        vos_mem_zero(pNeighborReportDesc->pNeighborBssDescription, sizeof(tSirNeighborBssDescription));
-       vos_mem_copy(pNeighborReportDesc->pNeighborBssDescription, &pNeighborRpt->sNeighborBssDescription[i], 
+       vos_mem_copy(pNeighborReportDesc->pNeighborBssDescription, &pNeighborRpt->sNeighborBssDescription[i],
                                                 sizeof(tSirNeighborBssDescription));
 
 #if defined WLAN_VOWIFI_DEBUG
@@ -1190,35 +1190,35 @@ eHalStatus sme_RrmProcessNeighborReport(tpAniSirGlobal pMac, void *pMsgBuf)
            vos_mem_free(pNeighborReportDesc);
        }
    }
-end:  
-   
+end:
+
    if (!csrLLCount(&pMac->rrm.rrmSmeContext.neighborReportCache))
       vosStatus = VOS_STATUS_E_FAILURE;
- 
+
    /* Received a report from AP. Indicate SUCCESS to the caller if there are some valid reports */
    rrmIndicateNeighborReportResult(pMac, vosStatus);
 
    return status;
 }
 /*--------------------------------------------------------------------------
-  \brief sme_RrmMsgProcessor() - sme_ProcessMsg() calls this function for the 
+  \brief sme_RrmMsgProcessor() - sme_ProcessMsg() calls this function for the
   messages that are handled by SME RRM module.
-  
+
   \param pMac - Pointer to the global MAC parameter structure.
   \param msg_type - the type of msg passed by PE as defined in wniApi.h
-  \param pMsgBuf - a pointer to a buffer that maps to various structures base 
+  \param pMsgBuf - a pointer to a buffer that maps to various structures base
                    on the message type.
                    The beginning of the buffer can always map to tSirSmeRsp.
-  
+
   \return eHAL_STATUS_SUCCESS - Validation is successful.
-  
+
   \sa
-  
+
   --------------------------------------------------------------------------*/
-eHalStatus sme_RrmMsgProcessor( tpAniSirGlobal pMac,  v_U16_t msg_type, 
+eHalStatus sme_RrmMsgProcessor( tpAniSirGlobal pMac,  v_U16_t msg_type,
                                 void *pMsgBuf)
 {
-   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH,
          FL(" Msg = %d for RRM measurement") , msg_type );
 
    //switch on the msg type & make the state transition accordingly
@@ -1234,7 +1234,7 @@ eHalStatus sme_RrmMsgProcessor( tpAniSirGlobal pMac,  v_U16_t msg_type,
 
       default:
          //err msg
-         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                FL("sme_RrmMsgProcessor:unknown msg type = %d"), msg_type);
 
          break;
@@ -1266,22 +1266,22 @@ void rrmIterMeasTimerHandle( v_PVOID_t userData )
    smsLog( pMac, LOGE, "Randomization timer expired...send on next channel ");
 #endif
     //Issue a scan req for next channel.
-    sme_RrmIssueScanReq( pMac ); 
+    sme_RrmIssueScanReq( pMac );
 }
 
 /* ---------------------------------------------------------------------------
-    
+
     \fn rrmNeighborRspTimeoutHandler
-    
-    \brief  Timer handler to handle the timeout condition when a neighbor request is sent 
+
+    \brief  Timer handler to handle the timeout condition when a neighbor request is sent
                     and no neighbor response is received from the AP
-    
+
     \param  pMac - The handle returned by macOpen.
-    
+
     \return VOID
-    
+
 ---------------------------------------------------------------------------*/
-    
+
 void rrmNeighborRspTimeoutHandler
 ( v_PVOID_t userData )
 {
@@ -1297,7 +1297,7 @@ void rrmNeighborRspTimeoutHandler
 
     \fn rrmOpen
 
-    \brief  
+    \brief
 
     \param  pMac - The handle returned by macOpen.
 
@@ -1366,7 +1366,7 @@ VOS_STATUS rrmOpen (tpAniSirGlobal pMac)
 
     \fn rrmClose
 
-    \brief  
+    \brief
 
     \param  pMac - The handle returned by macOpen.
 
@@ -1462,21 +1462,21 @@ VOS_STATUS rrmReady (tpAniSirGlobal pMac)
   ---------------------------------------------------------------------------*/
 VOS_STATUS rrmChangeDefaultConfigParam(tpAniSirGlobal pMac, tpRrmConfigParam pRrmConfig)
 {
-   vos_mem_copy( &pMac->rrm.rrmSmeContext.rrmConfig, pRrmConfig, sizeof( tRrmConfigParam ) ); 
+   vos_mem_copy( &pMac->rrm.rrmSmeContext.rrmConfig, pRrmConfig, sizeof( tRrmConfigParam ) );
 
    return VOS_STATUS_SUCCESS;
 }
 
 /* ---------------------------------------------------------------------------
-    
+
     \fn smeRrmGetFirstBssEntryFromNeighborCache()
-    
+
     \brief  This function returns the first entry from the neighbor cache to the caller
 
     \param  pMac - The handle returned by macOpen.
-    
+
     \return VOID
-    
+
 ---------------------------------------------------------------------------*/
 tRrmNeighborReportDesc* smeRrmGetFirstBssEntryFromNeighborCache( tpAniSirGlobal pMac)
 {
@@ -1500,18 +1500,18 @@ tRrmNeighborReportDesc* smeRrmGetFirstBssEntryFromNeighborCache( tpAniSirGlobal
 }
 
 /* ---------------------------------------------------------------------------
-    
+
     \fn smeRrmGetNextBssEntryFromNeighborCache()
-    
-    \brief  This function returns the entry next to the given entry from the 
+
+    \brief  This function returns the entry next to the given entry from the
                 neighbor cache to the caller
 
     \param  pMac - The handle returned by macOpen.
-    
+
     \return VOID
-    
+
 ---------------------------------------------------------------------------*/
-tRrmNeighborReportDesc* smeRrmGetNextBssEntryFromNeighborCache( tpAniSirGlobal pMac, 
+tRrmNeighborReportDesc* smeRrmGetNextBssEntryFromNeighborCache( tpAniSirGlobal pMac,
                                                         tpRrmNeighborReportDesc pBssEntry)
 {
    tListElem *pEntry;
@@ -1537,7 +1537,7 @@ void csrCcxSendAdjacentApRepMsg(tpAniSirGlobal pMac, tCsrRoamSession *pSession)
    tpSirAdjacentApRepInd pAdjRep;
    tANI_U16 length;
    tANI_U32 roamTS2;
-   
+
    smsLog( pMac, LOG1, "Adjacent AP Report Msg to PE");
 
    length = sizeof(tSirAdjacentApRepInd );
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 32cab08e4c2e..c00fc3e1779d 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -1400,7 +1400,7 @@ eHalStatus sme_getSoftApDomain(tHalHandle hHal,  v_REGDOMAIN_t *domainIdSoftAp)
 
    *domainIdSoftAp = pMac->scan.domainIdCurrent;
    status = eHAL_STATUS_SUCCESS;
-    
+
    return status;
 }
 
@@ -3308,7 +3308,7 @@ eHalStatus sme_RoamReassoc(tHalHandle hHal, tANI_U8 sessionId, tCsrRoamProfile *
         if( CSR_IS_SESSION_VALID( pMac, sessionId ) )
         {
             if((NULL == pProfile) && (fForce == 1))
-            { 
+            {
                 tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
                 /* to force the AP initiate fresh 802.1x authentication need to clear
                  * the PMKID cache for that set the following boolean. this is needed
@@ -4375,7 +4375,7 @@ eHalStatus sme_RequestBmps (
 
 /* ---------------------------------------------------------------------------
     \fn  sme_SetDHCPTillPowerActiveFlag
-    \brief  Sets/Clears DHCP related flag in PMC to disable/enable auto BMPS 
+    \brief  Sets/Clears DHCP related flag in PMC to disable/enable auto BMPS
             entry by PMC
     \param  hHal - The handle returned by macOpen.
   ---------------------------------------------------------------------------*/
@@ -6260,7 +6260,7 @@ eHalStatus sme_ScanGetBKIDCandidateList(tHalHandle hHal, tANI_U32 sessionId,
     \param pContext - a pointer passed in for the callback
     \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_getOemDataRsp(tHalHandle hHal, 
+eHalStatus sme_getOemDataRsp(tHalHandle hHal,
         tOemDataRsp **pOemDataRsp)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -6302,11 +6302,11 @@ eHalStatus sme_getOemDataRsp(tHalHandle hHal,
     \param pContext - a pointer passed in for the callback
     \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus sme_OemDataReq(tHalHandle hHal, 
+eHalStatus sme_OemDataReq(tHalHandle hHal,
         tANI_U8 sessionId,
-        tOemDataReqConfig *pOemDataReqConfig, 
-        tANI_U32 *pOemDataReqID, 
-        oemData_OemDataReqCompleteCallback callback, 
+        tOemDataReqConfig *pOemDataReqConfig,
+        tANI_U32 *pOemDataReqID,
+        oemData_OemDataReqCompleteCallback callback,
         void *pContext)
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -6858,7 +6858,7 @@ eHalStatus sme_GetOperationChannel(tHalHandle hHal, tANI_U32 *pChannel, tANI_U8
 
     \brief To register managment frame of specified type and subtype.
     \param frameType - type of the frame that needs to be passed to HDD.
-    \param matchData - data which needs to be matched before passing frame 
+    \param matchData - data which needs to be matched before passing frame
                        to HDD.
     \param matchDataLen - Length of matched data.
     \return eHalStatus
@@ -7207,24 +7207,24 @@ eHalStatus sme_ConfigureRxpFilter( tHalHandle hHal,
   \fn    sme_ConfigureSuspendInd
 
   \brief
-    SME will pass this request to lower mac to Indicate that the wlan needs to 
+    SME will pass this request to lower mac to Indicate that the wlan needs to
     be suspended
 
   \param
 
     hHal - The handle returned by macOpen.
- 
+
     wlanSuspendParam- Depicts the wlan suspend params
 
     csrReadyToSuspendCallback - Callback to be called when ready to suspend
                                 event is received.
     callbackContext  - Context associated with csrReadyToSuspendCallback.
-   
-  \return eHalStatus    
-  
-  
+
+  \return eHalStatus
+
+
 --------------------------------------------------------------------------- */
-eHalStatus sme_ConfigureSuspendInd( tHalHandle hHal, 
+eHalStatus sme_ConfigureSuspendInd( tHalHandle hHal,
                           tpSirWlanSuspendParam  wlanSuspendParam,
                           csrReadyToSuspendCallback callback,
                           void *callbackContext)
@@ -7263,13 +7263,13 @@ eHalStatus sme_ConfigureSuspendInd( tHalHandle hHal,
   \fn    sme_ConfigureResumeReq
 
   \brief
-    SME will pass this request to lower mac to Indicate that the wlan needs to 
+    SME will pass this request to lower mac to Indicate that the wlan needs to
     be Resumed
 
   \param
 
     hHal - The handle returned by macOpen.
- 
+
     wlanResumeParam- Depicts the wlan resume params
 
 
@@ -8039,7 +8039,7 @@ eHalStatus sme_ReceiveFilterSetFilter(tHalHandle hHal, tpSirRcvPktFilterCfgType
            pRequestBuf->paramsData[idx].compareData[4],
            pRequestBuf->paramsData[idx].compareData[5]);
 
-      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, 
+      VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
            "MData: %d:%d:%d:%d:%d:%d",
            pRequestBuf->paramsData[idx].dataMask[0],
            pRequestBuf->paramsData[idx].dataMask[1],
@@ -8524,12 +8524,12 @@ eHalStatus sme_HideSSID(tHalHandle hHal, v_U8_t sessionId, v_U8_t ssidHidden)
             sme_ReleaseGlobalLock( &pMac->sme );
             return eHAL_STATUS_FAILURE;
         }
-        
+
         if( !pSession->sessionActive )
             VOS_ASSERT(0);
 
         /* Create the message and send to lim */
-        len = sizeof(tSirUpdateParams); 
+        len = sizeof(tSirUpdateParams);
         pMsg = vos_mem_malloc(len);
         if ( NULL == pMsg )
            status = eHAL_STATUS_FAILURE;
@@ -10103,7 +10103,7 @@ VOS_STATUS sme_AddTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr pe
 /* ---------------------------------------------------------------------------
     \fn sme_DeleteTdlsPeerSta
     \brief  API to Delete TDLS peer sta entry.
-            
+
     \param  peerMac - peer's Mac Adress.
     \- return VOS_STATUS_SUCCES
     -------------------------------------------------------------------------*/
diff --git a/CORE/SME/src/sme_common/sme_FTApi.c b/CORE/SME/src/sme_common/sme_FTApi.c
index 17c7375bf2f0..012990fac291 100644
--- a/CORE/SME/src/sme_common/sme_FTApi.c
+++ b/CORE/SME/src/sme_common/sme_FTApi.c
@@ -40,18 +40,18 @@
 #include <csrNeighborRoam.h>
 
 /*--------------------------------------------------------------------------
-  Initialize the FT context. 
+  Initialize the FT context.
   ------------------------------------------------------------------------*/
 void sme_FTOpen(tHalHandle hHal)
 {
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
     eHalStatus     status = eHAL_STATUS_SUCCESS;
 
-    pMac->ft.ftSmeContext.auth_ft_ies = NULL;                        
-    pMac->ft.ftSmeContext.auth_ft_ies_length = 0;                        
+    pMac->ft.ftSmeContext.auth_ft_ies = NULL;
+    pMac->ft.ftSmeContext.auth_ft_ies_length = 0;
 
-    pMac->ft.ftSmeContext.reassoc_ft_ies = NULL;                        
-    pMac->ft.ftSmeContext.reassoc_ft_ies_length = 0;       
+    pMac->ft.ftSmeContext.reassoc_ft_ies = NULL;
+    pMac->ft.ftSmeContext.reassoc_ft_ies_length = 0;
     pMac->ft.ftSmeContext.setFTPreAuthState = FALSE;
     pMac->ft.ftSmeContext.setFTPTKState = FALSE;
     status = vos_timer_init(&pMac->ft.ftSmeContext.preAuthReassocIntvlTimer,VOS_TIMER_TYPE_SW,
@@ -61,16 +61,16 @@ void sme_FTOpen(tHalHandle hHal)
     {
         smsLog(pMac, LOGE, FL("Preauth Reassoc interval Timer allocation failed"));
         return;
-    }                 
+    }
 
-    pMac->ft.ftSmeContext.psavedFTPreAuthRsp = NULL;                        
+    pMac->ft.ftSmeContext.psavedFTPreAuthRsp = NULL;
     pMac->ft.ftSmeContext.pCsrFTKeyInfo = NULL;
 
     pMac->ft.ftSmeContext.FTState = eFT_START_READY;
 }
 
 /*--------------------------------------------------------------------------
-  Cleanup the SME FT Global context. 
+  Cleanup the SME FT Global context.
   ------------------------------------------------------------------------*/
 void sme_FTClose(tHalHandle hHal)
 {
@@ -85,7 +85,7 @@ void sme_FTClose(tHalHandle hHal)
         vos_mem_free(pMac->ft.ftSmeContext.auth_ft_ies);
         pMac->ft.ftSmeContext.auth_ft_ies = NULL;
     }
-    pMac->ft.ftSmeContext.auth_ft_ies_length = 0;                        
+    pMac->ft.ftSmeContext.auth_ft_ies_length = 0;
 
     if (pMac->ft.ftSmeContext.reassoc_ft_ies != NULL)
     {
@@ -94,9 +94,9 @@ void sme_FTClose(tHalHandle hHal)
             pMac->ft.ftSmeContext.reassoc_ft_ies);
 #endif
         vos_mem_free(pMac->ft.ftSmeContext.reassoc_ft_ies);
-        pMac->ft.ftSmeContext.reassoc_ft_ies = NULL;                        
+        pMac->ft.ftSmeContext.reassoc_ft_ies = NULL;
     }
-    pMac->ft.ftSmeContext.reassoc_ft_ies_length = 0;                        
+    pMac->ft.ftSmeContext.reassoc_ft_ies_length = 0;
 
     pMac->ft.ftSmeContext.FTState = eFT_START_READY;
     vos_mem_zero(pMac->ft.ftSmeContext.preAuthbssId, ANI_MAC_ADDR_SIZE);
@@ -108,7 +108,7 @@ void sme_FTClose(tHalHandle hHal)
             pMac->ft.ftSmeContext.psavedFTPreAuthRsp);
 #endif
         vos_mem_free(pMac->ft.ftSmeContext.psavedFTPreAuthRsp);
-        pMac->ft.ftSmeContext.psavedFTPreAuthRsp = NULL;                        
+        pMac->ft.ftSmeContext.psavedFTPreAuthRsp = NULL;
     }
 
     vos_timer_destroy(&pMac->ft.ftSmeContext.preAuthReassocIntvlTimer);
@@ -140,11 +140,11 @@ void sme_SetFTIEs( tHalHandle hHal, tANI_U8 sessionId, const tANI_U8 *ft_ies,
     status = sme_AcquireGlobalLock( &pMac->sme );
     if (!( HAL_STATUS_SUCCESS( status ))) return;
 
-    if (ft_ies == NULL) 
+    if (ft_ies == NULL)
     {
         smsLog( pMac, LOGE, FL(" ft ies is NULL"));
         sme_ReleaseGlobalLock( &pMac->sme );
-        return; 
+        return;
     }
 
 #if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
@@ -157,12 +157,12 @@ void sme_SetFTIEs( tHalHandle hHal, tANI_U8 sessionId, const tANI_U8 *ft_ies,
     {
         case eFT_START_READY:
         case eFT_AUTH_REQ_READY:
-            if ((pMac->ft.ftSmeContext.auth_ft_ies) && 
+            if ((pMac->ft.ftSmeContext.auth_ft_ies) &&
                     (pMac->ft.ftSmeContext.auth_ft_ies_length))
             {
                 // Free the one we received last from the supplicant
                 vos_mem_free(pMac->ft.ftSmeContext.auth_ft_ies);
-                pMac->ft.ftSmeContext.auth_ft_ies_length = 0; 
+                pMac->ft.ftSmeContext.auth_ft_ies_length = 0;
             }
 
             // Save the FT IEs
@@ -186,7 +186,7 @@ void sme_SetFTIEs( tHalHandle hHal, tANI_U8 sessionId, const tANI_U8 *ft_ies,
 
         case eFT_AUTH_COMPLETE:
             // We will need to re-start preauth. If we received FT IEs in
-            // eFT_PRE_AUTH_DONE state, it implies there was a rekey in 
+            // eFT_PRE_AUTH_DONE state, it implies there was a rekey in
             // our pre-auth state. Hence this implies we need Pre-auth again.
 
             // OK now inform SME we have no pre-auth list.
@@ -210,12 +210,12 @@ void sme_SetFTIEs( tHalHandle hHal, tANI_U8 sessionId, const tANI_U8 *ft_ies,
             smsLog( pMac, LOGE, "New Reassoc Req=%p in state %d",
                 ft_ies, pMac->ft.ftSmeContext.FTState);
 #endif
-            if ((pMac->ft.ftSmeContext.reassoc_ft_ies) && 
+            if ((pMac->ft.ftSmeContext.reassoc_ft_ies) &&
                 (pMac->ft.ftSmeContext.reassoc_ft_ies_length))
             {
                 // Free the one we received last from the supplicant
                 vos_mem_free(pMac->ft.ftSmeContext.reassoc_ft_ies);
-                pMac->ft.ftSmeContext.reassoc_ft_ies_length = 0; 
+                pMac->ft.ftSmeContext.reassoc_ft_ies_length = 0;
             }
 
             // Save the FT IEs
@@ -230,13 +230,13 @@ void sme_SetFTIEs( tHalHandle hHal, tANI_U8 sessionId, const tANI_U8 *ft_ies,
             pMac->ft.ftSmeContext.reassoc_ft_ies_length = ft_ies_length;
             vos_mem_copy((tANI_U8 *)pMac->ft.ftSmeContext.reassoc_ft_ies, ft_ies,
                           ft_ies_length);
-                
+
             pMac->ft.ftSmeContext.FTState = eFT_SET_KEY_WAIT;
 #if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
             smsLog( pMac, LOG1, "ft_ies_length=%d state=%d", ft_ies_length,
                 pMac->ft.ftSmeContext.FTState);
 #endif
-            
+
             break;
 
         default:
@@ -246,7 +246,7 @@ void sme_SetFTIEs( tHalHandle hHal, tANI_U8 sessionId, const tANI_U8 *ft_ies,
     }
     sme_ReleaseGlobalLock( &pMac->sme );
 }
-            
+
 eHalStatus sme_FTSendUpdateKeyInd(tHalHandle hHal, tCsrRoamSetKey * pFTKeyInfo)
 {
     tSirFTUpdateKeyInfo *pMsg;
@@ -265,10 +265,10 @@ eHalStatus sme_FTSendUpdateKeyInd(tHalHandle hHal, tCsrRoamSetKey * pFTKeyInfo)
       smsLog(pMac, LOG1, FL("%02x"), pFTKeyInfo->Key[i]);
 #endif
 
-    msgLen  = sizeof( tANI_U16) + sizeof( tANI_U16 ) + 
-       sizeof( pMsg->keyMaterial.length ) + sizeof( pMsg->keyMaterial.edType ) + 
+    msgLen  = sizeof( tANI_U16) + sizeof( tANI_U16 ) +
+       sizeof( pMsg->keyMaterial.length ) + sizeof( pMsg->keyMaterial.edType ) +
        sizeof( pMsg->keyMaterial.numKeys ) + sizeof( pMsg->keyMaterial.key );
-                     
+
     pMsg = vos_mem_malloc(msgLen);
     if ( NULL == pMsg )
     {
@@ -403,7 +403,7 @@ eHalStatus sme_FTUpdateKey( tHalHandle hHal, tCsrRoamSetKey * pFTKeyInfo )
               pMac->ft.ftSmeContext.FTState, status);
 #endif
        break;
-          
+
     default:
        smsLog( pMac, LOGE, "%s: Unhandled state=%d", __func__,
                pMac->ft.ftSmeContext.FTState);
@@ -421,7 +421,7 @@ eHalStatus sme_FTUpdateKey( tHalHandle hHal, tCsrRoamSetKey * pFTKeyInfo )
  * Reassoc Req.
  *
  *------------------------------------------------------------------------*/
-void sme_GetFTPreAuthResponse( tHalHandle hHal, tANI_U8 *ft_ies, 
+void sme_GetFTPreAuthResponse( tHalHandle hHal, tANI_U8 *ft_ies,
                                tANI_U32 ft_ies_ip_len, tANI_U16 *ft_ies_length )
 {
     tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -430,27 +430,27 @@ void sme_GetFTPreAuthResponse( tHalHandle hHal, tANI_U8 *ft_ies,
     *ft_ies_length = 0;
 
     status = sme_AcquireGlobalLock( &pMac->sme );
-    if (!( HAL_STATUS_SUCCESS( status ))) 
+    if (!( HAL_STATUS_SUCCESS( status )))
        return;
 
     /* All or nothing - proceed only if both BSSID and FT IE fit */
-    if((ANI_MAC_ADDR_SIZE + 
-       pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ft_ies_length) > ft_ies_ip_len) 
+    if((ANI_MAC_ADDR_SIZE +
+       pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ft_ies_length) > ft_ies_ip_len)
     {
        sme_ReleaseGlobalLock( &pMac->sme );
        return;
     }
 
-    // hdd needs to pack the bssid also along with the 
+    // hdd needs to pack the bssid also along with the
     // auth response to supplicant
     vos_mem_copy(ft_ies, pMac->ft.ftSmeContext.preAuthbssId, ANI_MAC_ADDR_SIZE);
-    
+
     // Copy the auth resp FTIEs
-    vos_mem_copy(&(ft_ies[ANI_MAC_ADDR_SIZE]), 
-                 pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ft_ies, 
+    vos_mem_copy(&(ft_ies[ANI_MAC_ADDR_SIZE]),
+                 pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ft_ies,
                  pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ft_ies_length);
 
-    *ft_ies_length = ANI_MAC_ADDR_SIZE + 
+    *ft_ies_length = ANI_MAC_ADDR_SIZE +
        pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ft_ies_length;
 
     pMac->ft.ftSmeContext.FTState = eFT_REASSOC_REQ_WAIT;
@@ -478,18 +478,18 @@ void sme_GetRICIEs( tHalHandle hHal, tANI_U8 *ric_ies, tANI_U32 ric_ies_ip_len,
     *ric_ies_length = 0;
 
     status = sme_AcquireGlobalLock( &pMac->sme );
-    if (!( HAL_STATUS_SUCCESS( status ))) 
+    if (!( HAL_STATUS_SUCCESS( status )))
        return;
 
     /* All or nothing */
-    if (pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ric_ies_length > 
+    if (pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ric_ies_length >
         ric_ies_ip_len)
     {
        sme_ReleaseGlobalLock( &pMac->sme );
        return;
     }
 
-    vos_mem_copy(ric_ies, pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ric_ies, 
+    vos_mem_copy(ric_ies, pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ric_ies,
                  pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ric_ies_length);
 
     *ric_ies_length = pMac->ft.ftSmeContext.psavedFTPreAuthRsp->ric_ies_length;
@@ -504,9 +504,9 @@ void sme_GetRICIEs( tHalHandle hHal, tANI_U8 *ric_ies, tANI_U32 ric_ies_ip_len,
 
 /*--------------------------------------------------------------------------
  *
- * Timer callback for the timer that is started between the preauth completion and 
- * reassoc request to the PE. In this interval, it is expected that the pre-auth response 
- * and RIC IEs are passed up to the WPA supplicant and received back the necessary FTIEs 
+ * Timer callback for the timer that is started between the preauth completion and
+ * reassoc request to the PE. In this interval, it is expected that the pre-auth response
+ * and RIC IEs are passed up to the WPA supplicant and received back the necessary FTIEs
  * required to be sent in the reassoc request
  *
  *------------------------------------------------------------------------*/
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index 8ab9f334ed03..228a6f1eaa86 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -3032,14 +3032,14 @@ VOS_STATUS vos_nv_getRegDomainFromCountryCode( v_REGDOMAIN_t *pRegDomain,
         {
             INIT_COMPLETION(pHddCtx->linux_reg_req);
             regulatory_hint(wiphy, country_code);
-            wait_result = wait_for_completion_interruptible_timeout(
-                                                            &pHddCtx->linux_reg_req,
-                                                            LINUX_REG_WAIT_TIME);
+            wait_result = wait_for_completion_timeout(
+                &pHddCtx->linux_reg_req,
+                LINUX_REG_WAIT_TIME);
 
             /* if the country information does not exist with the kernel,
                then the driver callback would not be called */
 
-            if (wait_result >= 0) {
+            if (wait_result > 0) {
 
                 /* the driver callback was called. this means the country
                    regulatory information was found in the kernel database.
@@ -3062,7 +3062,7 @@ VOS_STATUS vos_nv_getRegDomainFromCountryCode( v_REGDOMAIN_t *pRegDomain,
                 /* the country information has not been found in the kernel
                    database, return failure */
 
-                VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN,
+                VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
                            ("runtime country code is not found in kernel db"));
 
                 return VOS_STATUS_E_EXISTS;
diff --git a/CORE/VOSS/src/wlan_nv_template_builtin.c b/CORE/VOSS/src/wlan_nv_template_builtin.c
index 226414ad5dd1..ba03acf342b2 100644
--- a/CORE/VOSS/src/wlan_nv_template_builtin.c
+++ b/CORE/VOSS/src/wlan_nv_template_builtin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -446,261 +446,261 @@ static int tableNoOfFieldArray[TABLE_BUILTIN_MAX] =
 _NV_TEMPLATE_TABLE NvTablesBuiltIn[/*TABLES_MAX*/][TABLE_ENTRIES_MAX] = {
    { // TABLE_sHalNv
       {"jz",_TABLE_IDX(TABLE_sNvFields),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.fields) - (int)&nvDefaults),"fields"},
+         ((char *)&(nvDefaults.fields) - (char *)&nvDefaults),"fields"},
       {"jm",_TABLE_IDX(TABLE_tRateGroupPwr),(ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_SUBBANDS))),0,0,
-         ((int)&(nvDefaults.tables.pwrOptimum[0]) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.pwrOptimum[0]) - (char *)&nvDefaults.tables),
          "pwrOptimum"},
       {"dx",_TABLE_IDX(TABLE_sRegulatoryChannel),(ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_CHANNELS))),0,0,
-         ((int)&(nvDefaults.tables.regDomains[0].channels[0]) -
-          (int)&nvDefaults.tables.regDomains[0]),"channels"},
+         ((char *)&(nvDefaults.tables.regDomains[0].channels[0]) -
+          (char *)&nvDefaults.tables.regDomains[0]),"channels"},
       {"jn",_TABLE_IDX(TABLE_sRegulatoryDomains),(ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_REG_DOMAINS))),0,0,
-         ((int)&(nvDefaults.tables.regDomains[0]) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.regDomains[0]) - (char *)&nvDefaults.tables),
          "regDomains"},
       {"jo",_TABLE_IDX(TABLE_sDefaultCountry),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.defaultCountryTable) -
-          (int)&nvDefaults.tables),"defaultCountryTable"},
+         ((char *)&(nvDefaults.tables.defaultCountryTable) -
+          (char *)&nvDefaults.tables),"defaultCountryTable"},
       {"jp",_TABLE_IDX(TABLE_tTpcPowerTable),(ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_CHANNELS))),0,0,
-         ((int)&(nvDefaults.tables.plutCharacterized[0]) -
-          (int)&nvDefaults.tables),"plutCharacterized"},
+         ((char *)&(nvDefaults.tables.plutCharacterized[0]) -
+          (char *)&nvDefaults.tables),"plutCharacterized"},
       {"jr",_TABLE_IDX(TABLE_tRateGroupPwrVR),(ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_SUBBANDS))),0,0,
-         ((int)&(nvDefaults.tables.pwrOptimum_virtualRate[0]) -
-          (int)&nvDefaults.tables),"pwrOptimum_virtualRate"},
+         ((char *)&(nvDefaults.tables.pwrOptimum_virtualRate[0]) -
+          (char *)&nvDefaults.tables),"pwrOptimum_virtualRate"},
       {"js",_TABLE_IDX(TABLE_sFwConfig),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.fwConfig) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.fwConfig) - (char *)&nvDefaults.tables),
          "fwConfig"},
       {"jt",_TABLE_IDX(TABLE_sRssiChannelOffsets),(_ADD_SIZE1(2)|ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_INT))|(FIELD_SIZE_VALUE_BITS(2))),
-         0,0,((int)&(nvDefaults.tables.rssiChanOffsets[0]) -
-          (int)&nvDefaults.tables),"rssiChanOffsets"},
+         0,0,((char *)&(nvDefaults.tables.rssiChanOffsets[0]) -
+          (char *)&nvDefaults.tables),"rssiChanOffsets"},
       {"er",_TABLE_IDX(TABLE_sCalData),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData) -
-          (int)&nvDefaults.tables.hwCalValues),"calData"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData) -
+          (char *)&nvDefaults.tables.hwCalValues),"calData"},
       {"ju",_TABLE_IDX(TABLE_sHwCalValues),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.hwCalValues) - (char *)&nvDefaults.tables),
          "hwCalValues"},
       {"jx",_TABLE_IDX(TABLE_sOfdmCmdPwrOffset),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.ofdmCmdPwrOffset) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.ofdmCmdPwrOffset) - (char *)&nvDefaults.tables),
          "ofdmCmdPwrOffset"},
       {"jy",_TABLE_IDX(TABLE_sTxBbFilterMode),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.txbbFilterMode) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.txbbFilterMode) - (char *)&nvDefaults.tables),
          "txbbFilterMode"},
       {"j0",_TABLE_IDX(TABLE_sNvTables),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables) - (int)&nvDefaults),"tables"},
+         ((char *)&(nvDefaults.tables) - (char *)&nvDefaults),"tables"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sHalNv
 
    { // TABLE_sNvFields
-      {"ap",_ID_U16,SINGULAR,0,0,0,((int)&(nvDefaults.fields.productId) -
-          (int)&nvDefaults.fields),"productId"},
-      {"aq",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.fields.productBands) -
-          (int)&nvDefaults.fields),"productBands"},
-      {"ar",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.fields.wlanNvRevId) -
-          (int)&nvDefaults.fields),"wlanNvRevId"},
-      {"as",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.fields.numOfTxChains) -
-          (int)&nvDefaults.fields),"numOfTxChains"},
-      {"at",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.fields.numOfRxChains) -
-          (int)&nvDefaults.fields),"numOfRxChains"},
+      {"ap",_ID_U16,SINGULAR,0,0,0,((char *)&(nvDefaults.fields.productId) -
+          (char *)&nvDefaults.fields),"productId"},
+      {"aq",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.fields.productBands) -
+          (char *)&nvDefaults.fields),"productBands"},
+      {"ar",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.fields.wlanNvRevId) -
+          (char *)&nvDefaults.fields),"wlanNvRevId"},
+      {"as",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.fields.numOfTxChains) -
+          (char *)&nvDefaults.fields),"numOfTxChains"},
+      {"at",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.fields.numOfRxChains) -
+          (char *)&nvDefaults.fields),"numOfRxChains"},
       {"au",_ID_U8,(_ADD_SIZE1(NV_FIELD_MAC_ADDR_SIZE)|ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_INT))|
          (FIELD_SIZE_VALUE_BITS(NV_FIELD_MAC_ADDR_SIZE))),0,0,
-         ((int)&(nvDefaults.fields.macAddr[0]) - (int)&nvDefaults.fields),
+         ((char *)&(nvDefaults.fields.macAddr[0]) - (char *)&nvDefaults.fields),
          "macAddr"},
       {"av",_ID_U8,(_ADD_SIZE1(NV_FIELD_MAC_ADDR_SIZE)|ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_INT))|
          (FIELD_SIZE_VALUE_BITS(NV_FIELD_MAC_ADDR_SIZE))),0,0,
-         ((int)&(nvDefaults.fields.macAddr2[0]) - (int)&nvDefaults.fields),
+         ((char *)&(nvDefaults.fields.macAddr2[0]) - (char *)&nvDefaults.fields),
          "macAddr2"},
       {"aw",_ID_U8,(_ADD_SIZE1(NV_FIELD_MAC_ADDR_SIZE)|ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_INT))|
          (FIELD_SIZE_VALUE_BITS(NV_FIELD_MAC_ADDR_SIZE))),0,0,
-         ((int)&(nvDefaults.fields.macAddr3[0]) - (int)&nvDefaults.fields),
+         ((char *)&(nvDefaults.fields.macAddr3[0]) - (char *)&nvDefaults.fields),
          "macAddr3"},
       {"ax",_ID_U8,(_ADD_SIZE1(NV_FIELD_MAC_ADDR_SIZE)|ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_INT))|
          (FIELD_SIZE_VALUE_BITS(NV_FIELD_MAC_ADDR_SIZE))),0,0,
-         ((int)&(nvDefaults.fields.macAddr4[0]) - (int)&nvDefaults.fields),
+         ((char *)&(nvDefaults.fields.macAddr4[0]) - (char *)&nvDefaults.fields),
          "macAddr4"},
       {"ay",_ID_U8,(_ADD_SIZE1(NV_FIELD_MFG_SN_SIZE)|ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_INT))|
          (FIELD_SIZE_VALUE_BITS(NV_FIELD_MFG_SN_SIZE))),0,0,
-         ((int)&(nvDefaults.fields.mfgSN[0]) - (int)&nvDefaults.fields),"mfgSN"}
+         ((char *)&(nvDefaults.fields.mfgSN[0]) - (char *)&nvDefaults.fields),"mfgSN"}
          ,
-      {"az",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.fields.couplerType) -
-          (int)&nvDefaults.fields),"couplerType"},
-      {"a0",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.fields.nvVersion) -
-          (int)&nvDefaults.fields),"nvVersion"},
+      {"az",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.fields.couplerType) -
+          (char *)&nvDefaults.fields),"couplerType"},
+      {"a0",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.fields.nvVersion) -
+          (char *)&nvDefaults.fields),"nvVersion"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sNvFields
 
    { // TABLE_sRegulatoryChannel
       {"dv",_ID_U8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.regDomains[0].channels[0].enabled) -
-          (int)&nvDefaults.tables.regDomains[0].channels[0]),"enabled"},
+         ((char *)&(nvDefaults.tables.regDomains[0].channels[0].enabled) -
+          (char *)&nvDefaults.tables.regDomains[0].channels[0]),"enabled"},
       {"dw",_ID_S8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.regDomains[0].channels[0].pwrLimit) -
-          (int)&nvDefaults.tables.regDomains[0].channels[0]),"pwrLimit"},
+         ((char *)&(nvDefaults.tables.regDomains[0].channels[0].pwrLimit) -
+          (char *)&nvDefaults.tables.regDomains[0].channels[0]),"pwrLimit"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sRegulatoryChannel
 
    { // TABLE_sRssiChannelOffsets
       {"d1",_ID_S16,(ARRAY_1),((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_CHANNELS))),0,0,
-         ((int)&(nvDefaults.tables.rssiChanOffsets[0].bRssiOffset[0]) -
-          (int)&nvDefaults.tables.rssiChanOffsets[0]),"bRssiOffset"},
+         ((char *)&(nvDefaults.tables.rssiChanOffsets[0].bRssiOffset[0]) -
+          (char *)&nvDefaults.tables.rssiChanOffsets[0]),"bRssiOffset"},
       {"d2",_ID_S16,(ARRAY_1),((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_CHANNELS))),0,0,
-         ((int)&(nvDefaults.tables.rssiChanOffsets[0].gnRssiOffset[0]) -
-          (int)&nvDefaults.tables.rssiChanOffsets[0]),"gnRssiOffset"},
+         ((char *)&(nvDefaults.tables.rssiChanOffsets[0].gnRssiOffset[0]) -
+          (char *)&nvDefaults.tables.rssiChanOffsets[0]),"gnRssiOffset"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sRssiChannelOffsets
 
    { // TABLE_sCalData
       {"ea",_ID_U16,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHd2G) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"psSlpTimeOvrHd2G"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHd2G) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"psSlpTimeOvrHd2G"},
       {"eb",_ID_U16,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHd5G) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"psSlpTimeOvrHd5G"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHd5G) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"psSlpTimeOvrHd5G"},
       {"ec",_ID_U16,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"psSlpTimeOvrHdxLNA5G"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"psSlpTimeOvrHdxLNA5G"},
       {"ed",_ID_U8,SINGULAR,0,0,0,
-         (((int)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) +
-          sizeof(uint16)) - (int)&nvDefaults.tables.hwCalValues.calData),
+         (((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) +
+          sizeof(uint16)) - (char *)&nvDefaults.tables.hwCalValues.calData),
          "nv_TxBBFSel9MHz"},
       {"ee",_ID_U8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.hwParam2) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"hwParam2"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam2) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"hwParam2"},
       {"ef",_ID_U16,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.custom_tcxo_reg8) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"custom_tcxo_reg8"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.custom_tcxo_reg8) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"custom_tcxo_reg8"},
       {"eg",_ID_U16,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.custom_tcxo_reg9) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"custom_tcxo_reg9"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.custom_tcxo_reg9) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"custom_tcxo_reg9"},
       {"eh",_ID_U32,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.hwParam3) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"hwParam3"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam3) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"hwParam3"},
       {"ei",_ID_U32,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.hwParam4) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"hwParam4"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam4) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"hwParam4"},
       {"ej",_ID_U32,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.hwParam5) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"hwParam5"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam5) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"hwParam5"},
       {"ek",_ID_U32,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.hwParam6) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"hwParam6"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam6) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"hwParam6"},
       {"el",_ID_U32,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.hwParam7) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"hwParam7"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam7) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"hwParam7"},
       {"em",_ID_U32,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.hwParam8) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"hwParam8"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam8) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"hwParam8"},
       {"en",_ID_U32,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.hwParam9) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"hwParam9"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam9) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"hwParam9"},
       {"eo",_ID_U32,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.hwParam10) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"hwParam10"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam10) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"hwParam10"},
       {"ep",_ID_U32,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData.hwParam11) -
-          (int)&nvDefaults.tables.hwCalValues.calData),"hwParam11"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam11) -
+          (char *)&nvDefaults.tables.hwCalValues.calData),"hwParam11"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sCalData
 
    { // TABLE_sTxBbFilterMode
       {"es",_ID_U32,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.txbbFilterMode.txFirFilterMode) -
-          (int)&nvDefaults.tables.txbbFilterMode),"txFirFilterMode"},
+         ((char *)&(nvDefaults.tables.txbbFilterMode.txFirFilterMode) -
+          (char *)&nvDefaults.tables.txbbFilterMode),"txFirFilterMode"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sTxBbFilterMode
 
    { // TABLE_sOfdmCmdPwrOffset
       {"et",_ID_S16,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.ofdmCmdPwrOffset.ofdmPwrOffset) -
-          (int)&nvDefaults.tables.ofdmCmdPwrOffset),"ofdmPwrOffset"},
+         ((char *)&(nvDefaults.tables.ofdmCmdPwrOffset.ofdmPwrOffset) -
+          (char *)&nvDefaults.tables.ofdmCmdPwrOffset),"ofdmPwrOffset"},
       {"eu",_ID_S16,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.ofdmCmdPwrOffset.rsvd) -
-          (int)&nvDefaults.tables.ofdmCmdPwrOffset),"rsvd"},
+         ((char *)&(nvDefaults.tables.ofdmCmdPwrOffset.rsvd) -
+          (char *)&nvDefaults.tables.ofdmCmdPwrOffset),"rsvd"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sOfdmCmdPwrOffset
 
    { // TABLE_sDefaultCountry
       {"if",_ID_U8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.defaultCountryTable.regDomain) -
-          (int)&nvDefaults.tables.defaultCountryTable),"regDomain"},
+         ((char *)&(nvDefaults.tables.defaultCountryTable.regDomain) -
+          (char *)&nvDefaults.tables.defaultCountryTable),"regDomain"},
       {"ig",_ID_U8,(_ADD_SIZE1(NV_FIELD_COUNTRY_CODE_SIZE)|ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_INT))|
          (FIELD_SIZE_VALUE_BITS(NV_FIELD_COUNTRY_CODE_SIZE))),0,0,
-         ((int)&(nvDefaults.tables.defaultCountryTable.countryCode[0]) -
-          (int)&nvDefaults.tables.defaultCountryTable),"countryCode"},
+         ((char *)&(nvDefaults.tables.defaultCountryTable.countryCode[0]) -
+          (char *)&nvDefaults.tables.defaultCountryTable),"countryCode"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sDefaultCountry
 
    { // TABLE_sFwConfig
-      {"ih",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.skuID) -
-          (int)&nvDefaults.tables.fwConfig),"skuID"},
-      {"ii",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.tpcMode2G)
-          - (int)&nvDefaults.tables.fwConfig),"tpcMode2G"},
-      {"ij",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.tpcMode5G)
-          - (int)&nvDefaults.tables.fwConfig),"tpcMode5G"},
-      {"ik",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.configItem1)
-          - (int)&nvDefaults.tables.fwConfig),"configItem1"},
-      {"il",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.xPA2G) -
-          (int)&nvDefaults.tables.fwConfig),"xPA2G"},
-      {"im",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.xPA5G) -
-          (int)&nvDefaults.tables.fwConfig),"xPA5G"},
+      {"ih",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.skuID) -
+          (char *)&nvDefaults.tables.fwConfig),"skuID"},
+      {"ii",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.tpcMode2G)
+          - (char *)&nvDefaults.tables.fwConfig),"tpcMode2G"},
+      {"ij",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.tpcMode5G)
+          - (char *)&nvDefaults.tables.fwConfig),"tpcMode5G"},
+      {"ik",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.configItem1)
+          - (char *)&nvDefaults.tables.fwConfig),"configItem1"},
+      {"il",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.xPA2G) -
+          (char *)&nvDefaults.tables.fwConfig),"xPA2G"},
+      {"im",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.xPA5G) -
+          (char *)&nvDefaults.tables.fwConfig),"xPA5G"},
       {"in",_ID_U8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.fwConfig.extPaCtrl0Polarity) -
-          (int)&nvDefaults.tables.fwConfig),"extPaCtrl0Polarity"},
+         ((char *)&(nvDefaults.tables.fwConfig.extPaCtrl0Polarity) -
+          (char *)&nvDefaults.tables.fwConfig),"extPaCtrl0Polarity"},
       {"io",_ID_U8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.fwConfig.extPaCtrl1Polarity) -
-          (int)&nvDefaults.tables.fwConfig),"extPaCtrl1Polarity"},
-      {"ip",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.xLNA2G) -
-          (int)&nvDefaults.tables.fwConfig),"xLNA2G"},
-      {"iq",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.xLNA5G) -
-          (int)&nvDefaults.tables.fwConfig),"xLNA5G"},
-      {"ir",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.xCoupler2G)
-          - (int)&nvDefaults.tables.fwConfig),"xCoupler2G"},
-      {"is",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.xCoupler5G)
-          - (int)&nvDefaults.tables.fwConfig),"xCoupler5G"},
-      {"it",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.xPdet2G) -
-          (int)&nvDefaults.tables.fwConfig),"xPdet2G"},
-      {"iu",_ID_U8,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.xPdet5G) -
-          (int)&nvDefaults.tables.fwConfig),"xPdet5G"},
+         ((char *)&(nvDefaults.tables.fwConfig.extPaCtrl1Polarity) -
+          (char *)&nvDefaults.tables.fwConfig),"extPaCtrl1Polarity"},
+      {"ip",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.xLNA2G) -
+          (char *)&nvDefaults.tables.fwConfig),"xLNA2G"},
+      {"iq",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.xLNA5G) -
+          (char *)&nvDefaults.tables.fwConfig),"xLNA5G"},
+      {"ir",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.xCoupler2G)
+          - (char *)&nvDefaults.tables.fwConfig),"xCoupler2G"},
+      {"is",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.xCoupler5G)
+          - (char *)&nvDefaults.tables.fwConfig),"xCoupler5G"},
+      {"it",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.xPdet2G) -
+          (char *)&nvDefaults.tables.fwConfig),"xPdet2G"},
+      {"iu",_ID_U8,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.xPdet5G) -
+          (char *)&nvDefaults.tables.fwConfig),"xPdet5G"},
       {"iv",_ID_U8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.fwConfig.enableDPD2G) -
-          (int)&nvDefaults.tables.fwConfig),"enableDPD2G"},
+         ((char *)&(nvDefaults.tables.fwConfig.enableDPD2G) -
+          (char *)&nvDefaults.tables.fwConfig),"enableDPD2G"},
       {"iw",_ID_U8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.fwConfig.enableDPD5G) -
-          (int)&nvDefaults.tables.fwConfig),"enableDPD5G"},
+         ((char *)&(nvDefaults.tables.fwConfig.enableDPD5G) -
+          (char *)&nvDefaults.tables.fwConfig),"enableDPD5G"},
       {"ix",_ID_U8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.fwConfig.pdadcSelect2G) -
-          (int)&nvDefaults.tables.fwConfig),"pdadcSelect2G"},
+         ((char *)&(nvDefaults.tables.fwConfig.pdadcSelect2G) -
+          (char *)&nvDefaults.tables.fwConfig),"pdadcSelect2G"},
       {"iy",_ID_U8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.fwConfig.pdadcSelect5GLow) -
-          (int)&nvDefaults.tables.fwConfig),"pdadcSelect5GLow"},
+         ((char *)&(nvDefaults.tables.fwConfig.pdadcSelect5GLow) -
+          (char *)&nvDefaults.tables.fwConfig),"pdadcSelect5GLow"},
       {"iz",_ID_U8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.fwConfig.pdadcSelect5GMid) -
-          (int)&nvDefaults.tables.fwConfig),"pdadcSelect5GMid"},
+         ((char *)&(nvDefaults.tables.fwConfig.pdadcSelect5GMid) -
+          (char *)&nvDefaults.tables.fwConfig),"pdadcSelect5GMid"},
       {"i0",_ID_U8,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.fwConfig.pdadcSelect5GHigh) -
-          (int)&nvDefaults.tables.fwConfig),"pdadcSelect5GHigh"},
-      {"i1",_ID_U32,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.configItem2)
-          - (int)&nvDefaults.tables.fwConfig),"configItem2"},
-      {"i2",_ID_U32,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.configItem3)
-          - (int)&nvDefaults.tables.fwConfig),"configItem3"},
-      {"i3",_ID_U32,SINGULAR,0,0,0,((int)&(nvDefaults.tables.fwConfig.configItem4)
-          - (int)&nvDefaults.tables.fwConfig),"configItem4"},
+         ((char *)&(nvDefaults.tables.fwConfig.pdadcSelect5GHigh) -
+          (char *)&nvDefaults.tables.fwConfig),"pdadcSelect5GHigh"},
+      {"i1",_ID_U32,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.configItem2)
+          - (char *)&nvDefaults.tables.fwConfig),"configItem2"},
+      {"i2",_ID_U32,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.configItem3)
+          - (char *)&nvDefaults.tables.fwConfig),"configItem3"},
+      {"i3",_ID_U32,SINGULAR,0,0,0,((char *)&(nvDefaults.tables.fwConfig.configItem4)
+          - (char *)&nvDefaults.tables.fwConfig),"configItem4"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sFwConfig
 
@@ -710,16 +710,16 @@ _NV_TEMPLATE_TABLE NvTablesBuiltIn[/*TABLES_MAX*/][TABLE_ENTRIES_MAX] = {
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_PHY_MAX_TX_CHAINS))),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_INT))|
          (FIELD_SIZE_VALUE_BITS(TPC_MEM_POWER_LUT_DEPTH))),0,
-         ((int)&(nvDefaults.tables.plutCharacterized[0]) -
-          (int)&nvDefaults.tables.plutCharacterized[0]),"tTpcPowerTable"},
+         ((char *)&(nvDefaults.tables.plutCharacterized[0]) -
+          (char *)&nvDefaults.tables.plutCharacterized[0]),"tTpcPowerTable"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_tTpcPowerTable
 
    { // TABLE_tRateGroupPwr
       {"kb",_ID_U32,(ARRAY_1),((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_HAL_PHY_RATES))),0,0,
-         ((int)&(nvDefaults.tables.pwrOptimum[0]) -
-          (int)&nvDefaults.tables.pwrOptimum[0]),"tRateGroupPwr"},
+         ((char *)&(nvDefaults.tables.pwrOptimum[0]) -
+          (char *)&nvDefaults.tables.pwrOptimum[0]),"tRateGroupPwr"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_tRateGroupPwr
 
@@ -727,8 +727,8 @@ _NV_TEMPLATE_TABLE NvTablesBuiltIn[/*TABLES_MAX*/][TABLE_ENTRIES_MAX] = {
       {"kd",_ID_U32,(_ADD_SIZE1(NUM_RF_VR_RATE)|ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_INT))|
          (FIELD_SIZE_VALUE_BITS(NUM_RF_VR_RATE))),0,0,
-         ((int)&(nvDefaults.tables.pwrOptimum_virtualRate[0]) -
-          (int)&nvDefaults.tables.pwrOptimum_virtualRate[0]),"tRateGroupPwrVR"},
+         ((char *)&(nvDefaults.tables.pwrOptimum_virtualRate[0]) -
+          (char *)&nvDefaults.tables.pwrOptimum_virtualRate[0]),"tRateGroupPwrVR"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_tRateGroupPwrVR
 
@@ -736,30 +736,30 @@ _NV_TEMPLATE_TABLE NvTablesBuiltIn[/*TABLES_MAX*/][TABLE_ENTRIES_MAX] = {
       {"dx",_TABLE_IDX(TABLE_sRegulatoryChannel),(ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_CHANNELS))),0,0,
-         ((int)&(nvDefaults.tables.regDomains[0].channels[0]) -
-          (int)&nvDefaults.tables.regDomains[0]),"channels"},
+         ((char *)&(nvDefaults.tables.regDomains[0].channels[0]) -
+          (char *)&nvDefaults.tables.regDomains[0]),"channels"},
       {"dy",_ID_U32,(ARRAY_1),((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_SUBBANDS))),0,0,
-         ((int)&(nvDefaults.tables.regDomains[0].antennaGain[0]) -
-          (int)&nvDefaults.tables.regDomains[0]),"antennaGain"},
+         ((char *)&(nvDefaults.tables.regDomains[0].antennaGain[0]) -
+          (char *)&nvDefaults.tables.regDomains[0]),"antennaGain"},
       {"dz",_ID_U32,(ARRAY_1),((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_2_4GHZ_CHANNELS))),0,0,
-         ((int)&(nvDefaults.tables.regDomains[0].bRatePowerOffset[0]) -
-          (int)&nvDefaults.tables.regDomains[0]),"bRatePowerOffset"},
+         ((char *)&(nvDefaults.tables.regDomains[0].bRatePowerOffset[0]) -
+          (char *)&nvDefaults.tables.regDomains[0]),"bRatePowerOffset"},
       {"d0",_ID_U32,(ARRAY_1),((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_CHANNELS))),0,0,
-         ((int)&(nvDefaults.tables.regDomains[0].gnRatePowerOffset[0]) -
-          (int)&nvDefaults.tables.regDomains[0]),"gnRatePowerOffset"},
+         ((char *)&(nvDefaults.tables.regDomains[0].gnRatePowerOffset[0]) -
+          (char *)&nvDefaults.tables.regDomains[0]),"gnRatePowerOffset"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sRegulatoryDomains
 
    { // TABLE_sHwCalValues
       {"eq",_ID_U32,SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.validBmap) -
-          (int)&nvDefaults.tables.hwCalValues),"validBmap"},
+         ((char *)&(nvDefaults.tables.hwCalValues.validBmap) -
+          (char *)&nvDefaults.tables.hwCalValues),"validBmap"},
       {"er",_TABLE_IDX(TABLE_sCalData),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues.calData) -
-          (int)&nvDefaults.tables.hwCalValues),"calData"},
+         ((char *)&(nvDefaults.tables.hwCalValues.calData) -
+          (char *)&nvDefaults.tables.hwCalValues),"calData"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sHwCalValues
 
@@ -767,55 +767,55 @@ _NV_TEMPLATE_TABLE NvTablesBuiltIn[/*TABLES_MAX*/][TABLE_ENTRIES_MAX] = {
       {"jm",_TABLE_IDX(TABLE_tRateGroupPwr),(ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_SUBBANDS))),0,0,
-         ((int)&(nvDefaults.tables.pwrOptimum[0]) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.pwrOptimum[0]) - (char *)&nvDefaults.tables),
          "pwrOptimum"},
       {"jn",_TABLE_IDX(TABLE_sRegulatoryDomains),(ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_REG_DOMAINS))),0,0,
-         ((int)&(nvDefaults.tables.regDomains[0]) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.regDomains[0]) - (char *)&nvDefaults.tables),
          "regDomains"},
       {"jo",_TABLE_IDX(TABLE_sDefaultCountry),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.defaultCountryTable) -
-          (int)&nvDefaults.tables),"defaultCountryTable"},
+         ((char *)&(nvDefaults.tables.defaultCountryTable) -
+          (char *)&nvDefaults.tables),"defaultCountryTable"},
       {"jp",_TABLE_IDX(TABLE_tTpcPowerTable),(ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_CHANNELS))),0,0,
-         ((int)&(nvDefaults.tables.plutCharacterized[0]) -
-          (int)&nvDefaults.tables),"plutCharacterized"},
+         ((char *)&(nvDefaults.tables.plutCharacterized[0]) -
+          (char *)&nvDefaults.tables),"plutCharacterized"},
       {"jq",_ID_S16,(ARRAY_1),((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_CHANNELS))),0,0,
-         ((int)&(nvDefaults.tables.plutPdadcOffset[0]) -
-          (int)&nvDefaults.tables),"plutPdadcOffset"},
+         ((char *)&(nvDefaults.tables.plutPdadcOffset[0]) -
+          (char *)&nvDefaults.tables),"plutPdadcOffset"},
       {"jr",_TABLE_IDX(TABLE_tRateGroupPwrVR),(ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_SUBBANDS))),0,0,
-         ((int)&(nvDefaults.tables.pwrOptimum_virtualRate[0]) -
-          (int)&nvDefaults.tables),"pwrOptimum_virtualRate"},
+         ((char *)&(nvDefaults.tables.pwrOptimum_virtualRate[0]) -
+          (char *)&nvDefaults.tables),"pwrOptimum_virtualRate"},
       {"js",_TABLE_IDX(TABLE_sFwConfig),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.fwConfig) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.fwConfig) - (char *)&nvDefaults.tables),
          "fwConfig"},
       {"jt",_TABLE_IDX(TABLE_sRssiChannelOffsets),(_ADD_SIZE1(2)|ARRAY_1),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_INT))|(FIELD_SIZE_VALUE_BITS(2))),
-         0,0,((int)&(nvDefaults.tables.rssiChanOffsets[0]) -
-          (int)&nvDefaults.tables),"rssiChanOffsets"},
+         0,0,((char *)&(nvDefaults.tables.rssiChanOffsets[0]) -
+          (char *)&nvDefaults.tables),"rssiChanOffsets"},
       {"ju",_TABLE_IDX(TABLE_sHwCalValues),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.hwCalValues) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.hwCalValues) - (char *)&nvDefaults.tables),
          "hwCalValues"},
       {"jv",_ID_S16,(ARRAY_1),((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_CHANNELS))),0,0,
-         ((int)&(nvDefaults.tables.antennaPathLoss[0]) -
-          (int)&nvDefaults.tables),"antennaPathLoss"},
+         ((char *)&(nvDefaults.tables.antennaPathLoss[0]) -
+          (char *)&nvDefaults.tables),"antennaPathLoss"},
       {"jw",_ID_S16,(ARRAY_2),((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_802_11_MODES))),
          ((FIELD_SIZE_TYPE_BIT(FIELD_SIZE_IDX_ENUM))|
          (FIELD_SIZE_VALUE_BITS(INDEX_ENUM_NUM_RF_CHANNELS))),0,
-         ((int)&(nvDefaults.tables.pktTypePwrLimits[0][0]) -
-          (int)&nvDefaults.tables),"pktTypePwrLimits"},
+         ((char *)&(nvDefaults.tables.pktTypePwrLimits[0][0]) -
+          (char *)&nvDefaults.tables),"pktTypePwrLimits"},
       {"jx",_TABLE_IDX(TABLE_sOfdmCmdPwrOffset),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.ofdmCmdPwrOffset) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.ofdmCmdPwrOffset) - (char *)&nvDefaults.tables),
          "ofdmCmdPwrOffset"},
       {"jy",_TABLE_IDX(TABLE_sTxBbFilterMode),SINGULAR,0,0,0,
-         ((int)&(nvDefaults.tables.txbbFilterMode) - (int)&nvDefaults.tables),
+         ((char *)&(nvDefaults.tables.txbbFilterMode) - (char *)&nvDefaults.tables),
          "txbbFilterMode"},
       {{nul}, 0, 0, 0, 0, 0, 0,{nul}},
    }, // TABLE_sNvTables
diff --git a/firmware_bin/WCNSS_qcom_cfg.ini b/firmware_bin/WCNSS_qcom_cfg.ini
index 976f246e3301..840da833f30d 100755
--- a/firmware_bin/WCNSS_qcom_cfg.ini
+++ b/firmware_bin/WCNSS_qcom_cfg.ini
@@ -415,9 +415,6 @@ gScanAgingTime=0
 #If set to 1 Android Framwrok control the Power saving mechanism
 isAndroidPsEn=0
 
-#disable LDPC in STA mode if the AP is TXBF capable
-gDisableLDPCWithTxbfAP=1
-
 #Enable thermal mitigation
 gThermalMitigationEnable=0