Logging enhancements on 11k rrmApi.c file

As part of PE logging enhancements, more feature logging would be needed.
Since there are many instances which have logging with PELOG1,
defining PELOG1 might lead to phone going into download mode
if the logs are also dynamically enabled.
The plan is to define PELOG4 statically and have meaningful & sufficient
feature logging in PE till the instances with PELOG1 gets thin.

Change-Id: I30d03c9d6967710fbc4fbedafc98674463d06fb2
CRs-Fixed: 642977

2 files changed, 156 insertions, 189 deletions

diff --git a/CORE/MAC/src/pe/include/rrmApi.h b/CORE/MAC/src/pe/include/rrmApi.h
index f16386070cfb..c17028480a52 100644
--- a/CORE/MAC/src/pe/include/rrmApi.h
+++ b/CORE/MAC/src/pe/include/rrmApi.h
@@ -45,7 +45,7 @@
 #define RRM_BCN_RPT_NO_BSS_INFO    0
 #define RRM_BCN_RPT_MIN_RPT        1
 
-tANI_U8 rrmGetMinOfMaxTxPower(tPowerdBm regMax, tPowerdBm apTxPower);
+tANI_U8 rrmGetMinOfMaxTxPower(tpAniSirGlobal pMac, tPowerdBm regMax, tPowerdBm apTxPower);
 
 extern tSirRetStatus rrmInitialize(tpAniSirGlobal pMac);
 
diff --git a/CORE/MAC/src/pe/rrm/rrmApi.c b/CORE/MAC/src/pe/rrm/rrmApi.c
index b8cbb9e42242..4023bf6d1944 100644
--- a/CORE/MAC/src/pe/rrm/rrmApi.c
+++ b/CORE/MAC/src/pe/rrm/rrmApi.c
@@ -54,7 +54,8 @@
 #include "rrmApi.h"
 
 tANI_U8
-rrmGetMinOfMaxTxPower(tPowerdBm regMax, tPowerdBm apTxPower)
+rrmGetMinOfMaxTxPower(tpAniSirGlobal pMac,
+                         tPowerdBm regMax, tPowerdBm apTxPower)
 {
     tANI_U8 maxTxPower = 0;
     tANI_U8 txPower = VOS_MIN( regMax, (apTxPower) );
@@ -65,6 +66,9 @@ rrmGetMinOfMaxTxPower(tPowerdBm regMax, tPowerdBm apTxPower)
     else
         maxTxPower = RRM_MAX_TX_PWR_CAP;
 
+    limLog( pMac, LOG3,
+                  "%s: regulatoryMax = %d, apTxPwr = %d, maxTxpwr = %d",
+                  __func__, regMax, apTxPower, maxTxPower );
     return maxTxPower;
 }
 
@@ -86,11 +90,13 @@ rrmGetMinOfMaxTxPower(tPowerdBm regMax, tPowerdBm apTxPower)
 void
 rrmCacheMgmtTxPower ( tpAniSirGlobal pMac, tPowerdBm txPower, tpPESession pSessionEntry )
 {
-#if defined WLAN_VOWIFI_DEBUG
-   PELOGE(limLog( pMac, LOGE, "Cache Mgmt Tx Power = %d", txPower );)
-#endif
+   limLog( pMac, LOG3, "Cache Mgmt Tx Power = %d", txPower );
+
    if( pSessionEntry == NULL )
+   {
+       limLog( pMac, LOG3, "%s: pSessionEntry is NULL", __func__);
        pMac->rrm.rrmPEContext.txMgmtPower = txPower;
+   }
    else
        pSessionEntry->txMgmtPower = txPower;
 }
@@ -113,13 +119,12 @@ rrmCacheMgmtTxPower ( tpAniSirGlobal pMac, tPowerdBm txPower, tpPESession pSessi
 tPowerdBm
 rrmGetMgmtTxPower ( tpAniSirGlobal pMac, tpPESession pSessionEntry )
 {
-#if defined WLAN_VOWIFI_DEBUG
-   PELOGE(limLog( pMac, LOGE, "RrmGetMgmtTxPower called" );)
-#endif
+   limLog( pMac, LOG3, "RrmGetMgmtTxPower called" );
+
    if( pSessionEntry == NULL )
    {
-     limLog( pMac, LOG3, "%s: txpower from rrmPEContext: %d",
-            __func__, pMac->rrm.rrmPEContext.txMgmtPower);
+      limLog( pMac, LOG3, "%s: txpower from rrmPEContext: %d",
+                     __func__, pMac->rrm.rrmPEContext.txMgmtPower);
       return pMac->rrm.rrmPEContext.txMgmtPower;
    }
 
@@ -161,9 +166,7 @@ rrmSendSetMaxTxPowerReq ( tpAniSirGlobal pMac, tPowerdBm txPower, tpPESession pS
       return eSIR_MEM_ALLOC_FAILED;
 
    }
-#if defined WLAN_VOWIFI_DEBUG
-   PELOGE(limLog( pMac, LOGE, FL(" Allocated memory for pMaxTxParams...will be freed in other module") );)
-#endif
+   /* Allocated memory for pMaxTxParams...will be freed in other module */
    pMaxTxParams->power = txPower;
    vos_mem_copy(pMaxTxParams->bssId, pSessionEntry->bssId, sizeof(tSirMacAddr));
    vos_mem_copy(pMaxTxParams->selfStaMacAddr, pSessionEntry->selfMacAddr, sizeof(tSirMacAddr));
@@ -174,7 +177,9 @@ rrmSendSetMaxTxPowerReq ( tpAniSirGlobal pMac, tPowerdBm txPower, tpPESession pS
    msgQ.bodyptr = pMaxTxParams;
    msgQ.bodyval = 0;
 
-   PELOGW(limLog(pMac, LOGW, FL( "Sending WDA_SET_MAX_TX_POWER_REQ to HAL"));)
+   limLog(pMac, LOG3,
+          FL( "Sending WDA_SET_MAX_TX_POWER_REQ with power(%d) to HAL"),
+          txPower);
 
       MTRACE(macTraceMsgTx(pMac, pSessionEntry->peSessionId, msgQ.type));
    if( eSIR_SUCCESS != (retCode = wdaPostCtrlMsg( pMac, &msgQ )))
@@ -267,12 +272,12 @@ rrmProcessLinkMeasurementRequest( tpAniSirGlobal pMac,
    tpSirMacMgmtHdr   pHdr;
    v_S7_t            currentRSSI = 0;
 
-#if defined WLAN_VOWIFI_DEBUG
-   PELOG1(limLog( pMac, LOG1, "Received Link measurement request");)
-#endif
+   limLog( pMac, LOG3, "Received Link measurement request");
+
    if( pRxPacketInfo == NULL || pLinkReq == NULL || pSessionEntry == NULL )
    {
-      PELOGE(limLog( pMac, LOGE, FL("Invalid parameters - Ignoring the request"));)
+      PELOGE(limLog( pMac, LOGE,
+             "%s Invalid parameters - Ignoring the request", __func__);)
       return eSIR_FAILURE;
    }
    pHdr = WDA_GET_RX_MAC_HEADER( pRxPacketInfo );
@@ -334,9 +339,8 @@ rrmProcessLinkMeasurementRequest( tpAniSirGlobal pMac,
    LinkReport.txAntenna = 0;
    currentRSSI = WDA_GET_RX_RSSI_DB(pRxPacketInfo);
 
-#if defined WLAN_VOWIFI_DEBUG
-   PELOG1(limLog( pMac, LOG1, "Received Link report frame with %d", currentRSSI);)
-#endif
+   limLog( pMac, LOG1,
+          "Received Link report frame with %d", currentRSSI);
 
    // 2008 11k spec reference: 18.4.8.5 RCPI Measurement
    if ((currentRSSI) <= RCPI_LOW_RSSI_VALUE)
@@ -348,12 +352,9 @@ rrmProcessLinkMeasurementRequest( tpAniSirGlobal pMac,
 
    LinkReport.rsni = WDA_GET_RX_SNR(pRxPacketInfo);
 
-#if defined WLAN_VOWIFI_DEBUG
-   PELOG1(limLog( pMac, LOG1, "Sending Link report frame");)
-#endif
-   return limSendLinkReportActionFrame( pMac, &LinkReport, pHdr->sa, pSessionEntry );
-
+   limLog( pMac, LOG3, "Sending Link report frame");
 
+   return limSendLinkReportActionFrame( pMac, &LinkReport, pHdr->sa, pSessionEntry );
 }
 
 // --------------------------------------------------------------------
@@ -389,14 +390,13 @@ rrmProcessNeighborReportResponse( tpAniSirGlobal pMac,
       return status;
    }
 
-#if defined WLAN_VOWIFI_DEBUG
-   PELOGE(limLog( pMac, LOGE, FL("Neighbor report response received ") );)
-#endif
+   limLog( pMac, LOG3, FL("Neighbor report response received ") );
 
    // Dialog token
    if( pMac->rrm.rrmPEContext.DialogToken != pNeighborRep->DialogToken.token )
    {
-      PELOGE(limLog( pMac, LOGE, "Dialog token mismatch in the received Neighbor report");)
+      PELOGE(limLog( pMac, LOGE,
+             "Dialog token mismatch in the received Neighbor report");)
       return eSIR_FAILURE;
    }
    if( pNeighborRep->num_NeighborReport == 0 )
@@ -416,9 +416,8 @@ rrmProcessNeighborReportResponse( tpAniSirGlobal pMac,
 
    }
    vos_mem_set(pSmeNeighborRpt, length, 0);
-#if defined WLAN_VOWIFI_DEBUG
-   PELOGE(limLog( pMac, LOGE, FL(" Allocated memory for pSmeNeighborRpt...will be freed by other module") );)
-#endif
+
+   /* Allocated memory for pSmeNeighborRpt...will be freed by other module */
 
    for( i = 0 ; i < pNeighborRep->num_NeighborReport ; i++ )
    {
@@ -492,10 +491,7 @@ rrmProcessNeighborReportReq( tpAniSirGlobal pMac,
       return eSIR_FAILURE;
    }
 
-#if defined WLAN_VOWIFI_DEBUG
-   PELOGE(limLog( pMac, LOGE, FL("Neighbor Request received ") );)
-   PELOGE(limLog( pMac, LOGE, "SSID present = %d ", pNeighborReq->noSSID );)
-#endif
+   limLog( pMac, LOG1, FL("SSID present = %d "), pNeighborReq->noSSID );
 
    vos_mem_set(&NeighborReportReq,sizeof( tSirMacNeighborReportReq ), 0);
 
@@ -504,9 +500,7 @@ rrmProcessNeighborReportReq( tpAniSirGlobal pMac,
    if( NeighborReportReq.ssid_present )
    {
       vos_mem_copy(&NeighborReportReq.ssid, &pNeighborReq->ucSSID, sizeof(tSirMacSSid));
-#if defined WLAN_VOWIFI_DEBUG
       PELOGE(sirDumpBuf( pMac, SIR_LIM_MODULE_ID, LOGE, (tANI_U8*) NeighborReportReq.ssid.ssId, NeighborReportReq.ssid.length );)
-#endif
    }
 
    status = limSendNeighborReportRequestFrame( pMac, &NeighborReportReq, pNeighborReq->bssId, pSessionEntry );
@@ -576,16 +570,15 @@ rrmProcessBeaconReportReq( tpAniSirGlobal pMac,
 
    measDuration = pBeaconReq->measurement_request.Beacon.meas_duration;
 
-#if defined WLAN_VOWIFI_DEBUG
-   limLog( pMac, LOGE, "maxDuration = %d sign = %d maxMeasduration = %d measDuration = %d",
-        maxDuration, sign, maxMeasduration, measDuration );
-#endif
+   limLog( pMac, LOG3,
+          "maxDuration = %d sign = %d maxMeasduration = %d measDuration = %d",
+          maxDuration, sign, maxMeasduration, measDuration );
 
    if( maxMeasduration < measDuration )
    {
       if( pBeaconReq->durationMandatory )
       {
-         limLog( pMac, LOGE, "Dropping the request: duration mandatory and maxduration > measduration");
+         PELOGE(limLog( pMac, LOGE, "Dropping the request: duration mandatory and maxduration > measduration");)
          return eRRM_REFUSED;
       }
       else
@@ -607,9 +600,8 @@ rrmProcessBeaconReportReq( tpAniSirGlobal pMac,
                FL( "Unable to allocate memory for request IEs buffer" ));
             return eRRM_FAILURE;
       }
-#if defined WLAN_VOWIFI_DEBUG
-      PELOGE(limLog( pMac, LOGE, FL(" Allocated memory for pElementIds") );)
-#endif
+      limLog( pMac, LOG3, FL(" Allocated memory for pElementIds") );
+
       pCurrentReq->request.Beacon.reqIes.num = pBeaconReq->measurement_request.Beacon.RequestedInfo.num_requested_eids;
       vos_mem_copy(pCurrentReq->request.Beacon.reqIes.pElementIds,
                    pBeaconReq->measurement_request.Beacon.RequestedInfo.requested_eids,
@@ -635,9 +627,7 @@ rrmProcessBeaconReportReq( tpAniSirGlobal pMac,
 
    vos_mem_set(pSmeBcnReportReq,sizeof( tSirBeaconReportReqInd ),0);
 
-#if defined WLAN_VOWIFI_DEBUG
-   PELOGE(limLog( pMac, LOGE, FL(" Allocated memory for pSmeBcnReportReq....will be freed by other module") );)
-#endif
+   /* Allocated memory for pSmeBcnReportReq....will be freed by other modulea*/
    vos_mem_copy(pSmeBcnReportReq->bssId, pSessionEntry->bssId, sizeof(tSirMacAddr));
    pSmeBcnReportReq->messageType = eWNI_SME_BEACON_REPORT_REQ_IND;
    pSmeBcnReportReq->length = sizeof( tSirBeaconReportReqInd );
@@ -736,9 +726,8 @@ rrmFillBeaconIes( tpAniSirGlobal pMac,
    while ( BcnNumIes > 0 )
    {
       len = *(pBcnIes + 1) + 2; //element id + length.
-#if defined WLAN_VOWIFI_DEBUG
-      PELOGE(limLog( pMac, LOGE, "EID = %d, len = %d total = %d", *pBcnIes, *(pBcnIes+1), len );)
-#endif
+      limLog( pMac, LOG3, "EID = %d, len = %d total = %d",
+             *pBcnIes, *(pBcnIes+1), len );
 
       i = 0;
       do
@@ -746,9 +735,8 @@ rrmFillBeaconIes( tpAniSirGlobal pMac,
          if( ( (eids == NULL) || ( *pBcnIes == eids[i] ) )  &&
              ( (*pNumIes) + len) < pIesMaxSize )
          {
-#if defined WLAN_VOWIFI_DEBUG
-            PELOGE(limLog( pMac, LOGE, "Adding Eid %d, len=%d", *pBcnIes, len );)
-#endif
+            limLog( pMac, LOG3, "Adding Eid %d, len=%d", *pBcnIes, len );
+
             vos_mem_copy(pIes, pBcnIes, len);
             pIes += len;
             *pNumIes += len;
@@ -761,9 +749,7 @@ rrmFillBeaconIes( tpAniSirGlobal pMac,
       pBcnIes += len;
       BcnNumIes -= len;
    }
-#if defined WLAN_VOWIFI_DEBUG
-   PELOGE(limLog( pMac, LOGE, "Total length of Ies added = %d", *pNumIes );)
-#endif
+   limLog( pMac, LOG1, "Total length of Ies added = %d", *pNumIes );
 }
 
 // --------------------------------------------------------------------
@@ -792,10 +778,7 @@ rrmProcessBeaconReportXmit( tpAniSirGlobal pMac,
    tANI_U8 sessionId;
    v_U8_t flagBSSPresent = FALSE, bssDescCnt = 0;
 
-#if defined WLAN_VOWIFI_DEBUG
-   PELOGE(limLog( pMac, LOGE, "Received beacon report xmit indication");)
-#endif
-
+   limLog( pMac, LOG1, "Received beacon report xmit indication");
 
    if (NULL == pBcnReport)
    {
@@ -821,7 +804,7 @@ rrmProcessBeaconReportXmit( tpAniSirGlobal pMac,
                                                         pBcnReport->bssId,
                                                         &sessionId)))
       {
-         PELOGE(limLog(pMac, LOGE,FL("session does not exist for given bssId"));)
+         PELOGE(limLog(pMac, LOGE, FL("session does not exist for given bssId"));)
          return eSIR_FAILURE;
       }
 
@@ -830,7 +813,7 @@ rrmProcessBeaconReportXmit( tpAniSirGlobal pMac,
 
       if (NULL == pReport)
       {
-         PELOGE(limLog(pMac, LOGE,FL("RRM Report is NULL, allocation failed"));)
+         PELOGE(limLog(pMac, LOGE, FL("RRM Report is NULL, allocation failed"));)
          return eSIR_FAILURE;
       }
 
@@ -839,99 +822,91 @@ rrmProcessBeaconReportXmit( tpAniSirGlobal pMac,
 
       for (bssDescCnt = 0; bssDescCnt < pBcnReport->numBssDesc; bssDescCnt++)
       {
-          //Prepare the beacon report and send it to the peer.
-          pReport[bssDescCnt].token = pBcnReport->uDialogToken;
-          pReport[bssDescCnt].refused = 0;
-          pReport[bssDescCnt].incapable = 0;
-          pReport[bssDescCnt].type = SIR_MAC_RRM_BEACON_TYPE;
-
-          //If the scan result is NULL then send report request with
-          //option subelement as NULL..
-          if ( NULL != pBcnReport->pBssDescription[bssDescCnt] )
-          {
-              flagBSSPresent = TRUE;
-          }
-
-          //Valid response is included if the size of beacon xmit
-          //is == size of beacon xmit ind + ies
-          if ( pBcnReport->length >= sizeof( tSirBeaconReportXmitInd ) )
-          {
-              pReport[bssDescCnt].report.beaconReport.regClass =  pBcnReport->regClass;
-              if ( flagBSSPresent )
-              {
-                  pReport[bssDescCnt].report.beaconReport.channel =
-                                    pBcnReport->pBssDescription[bssDescCnt]->channelId;
-                  vos_mem_copy( pReport[bssDescCnt].report.beaconReport.measStartTime,
-                                pBcnReport->pBssDescription[bssDescCnt]->startTSF,
-                                sizeof( pBcnReport->pBssDescription[bssDescCnt]->startTSF) );
-                  pReport[bssDescCnt].report.beaconReport.measDuration =
-                                    SYS_MS_TO_TU(pBcnReport->duration);
-                  pReport[bssDescCnt].report.beaconReport.phyType =
-                                pBcnReport->pBssDescription[bssDescCnt]->nwType;
-                  pReport[bssDescCnt].report.beaconReport.bcnProbeRsp = 1;
-                  pReport[bssDescCnt].report.beaconReport.rsni =
-                                pBcnReport->pBssDescription[bssDescCnt]->sinr;
-                  pReport[bssDescCnt].report.beaconReport.rcpi =
-                                pBcnReport->pBssDescription[bssDescCnt]->rssi;
-
-                  pReport[bssDescCnt].report.beaconReport.antennaId = 0;
-                  pReport[bssDescCnt].report.beaconReport.parentTSF =
-                                pBcnReport->pBssDescription[bssDescCnt]->parentTSF;
-                  vos_mem_copy( pReport[bssDescCnt].report.beaconReport.bssid,
-                                pBcnReport->pBssDescription[bssDescCnt]->bssId,
-                                sizeof(tSirMacAddr));
-              }
-
-              switch ( pCurrentReq->request.Beacon.reportingDetail )
-              {
-                  case BEACON_REPORTING_DETAIL_NO_FF_IE:
-                  //0 No need to include any elements.
-#if defined WLAN_VOWIFI_DEBUG
-                  PELOGE(limLog(pMac, LOGE, "No reporting detail requested");)
-#endif
-                  break;
-                  case BEACON_REPORTING_DETAIL_ALL_FF_REQ_IE:
-                  //1: Include all FFs and Requested Ies.
-#if defined WLAN_VOWIFI_DEBUG
-                  PELOGE(limLog(pMac, LOGE,
-                  "Only requested IEs in reporting detail requested");)
-#endif
+         //Prepare the beacon report and send it to the peer.
+         pReport[bssDescCnt].token = pBcnReport->uDialogToken;
+         pReport[bssDescCnt].refused = 0;
+         pReport[bssDescCnt].incapable = 0;
+         pReport[bssDescCnt].type = SIR_MAC_RRM_BEACON_TYPE;
+
+         //If the scan result is NULL then send report request with
+         //option subelement as NULL..
+         if ( NULL != pBcnReport->pBssDescription[bssDescCnt] )
+         {
+            flagBSSPresent = TRUE;
+         }
 
-                  if ( flagBSSPresent )
-                  {
-                      rrmFillBeaconIes( pMac,
-                         (tANI_U8*) &pReport[bssDescCnt].report.beaconReport.Ies[0],
-                         (tANI_U8*) &pReport[bssDescCnt].report.beaconReport.numIes,
-                         BEACON_REPORT_MAX_IES,
-                         pCurrentReq->request.Beacon.reqIes.pElementIds,
-                         pCurrentReq->request.Beacon.reqIes.num,
-                         pBcnReport->pBssDescription[bssDescCnt] );
-                  }
+         //Valid response is included if the size of beacon xmit
+         //is == size of beacon xmit ind + ies
+         if ( pBcnReport->length >= sizeof( tSirBeaconReportXmitInd ) )
+         {
+            pReport[bssDescCnt].report.beaconReport.regClass =  pBcnReport->regClass;
+            if ( flagBSSPresent )
+            {
+               pReport[bssDescCnt].report.beaconReport.channel =
+                                 pBcnReport->pBssDescription[bssDescCnt]->channelId;
+               vos_mem_copy( pReport[bssDescCnt].report.beaconReport.measStartTime,
+                             pBcnReport->pBssDescription[bssDescCnt]->startTSF,
+                             sizeof( pBcnReport->pBssDescription[bssDescCnt]->startTSF) );
+               pReport[bssDescCnt].report.beaconReport.measDuration =
+                                 SYS_MS_TO_TU(pBcnReport->duration);
+               pReport[bssDescCnt].report.beaconReport.phyType =
+                             pBcnReport->pBssDescription[bssDescCnt]->nwType;
+               pReport[bssDescCnt].report.beaconReport.bcnProbeRsp = 1;
+               pReport[bssDescCnt].report.beaconReport.rsni =
+                             pBcnReport->pBssDescription[bssDescCnt]->sinr;
+               pReport[bssDescCnt].report.beaconReport.rcpi =
+                             pBcnReport->pBssDescription[bssDescCnt]->rssi;
+
+               pReport[bssDescCnt].report.beaconReport.antennaId = 0;
+               pReport[bssDescCnt].report.beaconReport.parentTSF =
+                             pBcnReport->pBssDescription[bssDescCnt]->parentTSF;
+               vos_mem_copy( pReport[bssDescCnt].report.beaconReport.bssid,
+                             pBcnReport->pBssDescription[bssDescCnt]->bssId,
+                             sizeof(tSirMacAddr));
+            }
 
-                  break;
-                  case BEACON_REPORTING_DETAIL_ALL_FF_IE:
-                  //2 / default - Include all FFs and all Ies.
-                  default:
-#if defined WLAN_VOWIFI_DEBUG
-                  PELOGE(limLog(pMac, LOGE, "Default all IEs and FFs");)
-#endif
-                  if ( flagBSSPresent )
-                  {
-                      rrmFillBeaconIes( pMac,
-                         (tANI_U8*) &pReport[bssDescCnt].report.beaconReport.Ies[0],
-                         (tANI_U8*) &pReport[bssDescCnt].report.beaconReport.numIes,
-                         BEACON_REPORT_MAX_IES,
-                         NULL, 0,
-                         pBcnReport->pBssDescription[bssDescCnt] );
-                  }
-                  break;
-             }
-          }
+            switch ( pCurrentReq->request.Beacon.reportingDetail )
+            {
+               case BEACON_REPORTING_DETAIL_NO_FF_IE:
+               //0 No need to include any elements.
+                limLog(pMac, LOG3, "No reporting detail requested");
+               break;
+               case BEACON_REPORTING_DETAIL_ALL_FF_REQ_IE:
+               //1: Include all FFs and Requested Ies.
+               limLog(pMac, LOG3,
+               "Only requested IEs in reporting detail requested");
+
+               if ( flagBSSPresent )
+               {
+                   rrmFillBeaconIes( pMac,
+                      (tANI_U8*) &pReport[bssDescCnt].report.beaconReport.Ies[0],
+                      (tANI_U8*) &pReport[bssDescCnt].report.beaconReport.numIes,
+                      BEACON_REPORT_MAX_IES,
+                      pCurrentReq->request.Beacon.reqIes.pElementIds,
+                      pCurrentReq->request.Beacon.reqIes.num,
+                      pBcnReport->pBssDescription[bssDescCnt] );
+               }
+
+               break;
+               case BEACON_REPORTING_DETAIL_ALL_FF_IE:
+               //2 / default - Include all FFs and all Ies.
+               default:
+               limLog(pMac, LOG3, "Default all IEs and FFs");
+               if ( flagBSSPresent )
+               {
+                   rrmFillBeaconIes( pMac,
+                      (tANI_U8*) &pReport[bssDescCnt].report.beaconReport.Ies[0],
+                      (tANI_U8*) &pReport[bssDescCnt].report.beaconReport.numIes,
+                      BEACON_REPORT_MAX_IES,
+                      NULL, 0,
+                      pBcnReport->pBssDescription[bssDescCnt] );
+               }
+               break;
+            }
+         }
       }
 
-#if defined WLAN_VOWIFI_DEBUG
-      PELOGE(limLog( pMac, LOGE, "Sending Action frame ");)
-#endif
+      limLog( pMac, LOG1, "Sending Action frame with %d bss info", bssDescCnt);
       limSendRadioMeasureReportActionFrame( pMac,
                                             pCurrentReq->dialog_token,
                                             bssDescCnt,
@@ -944,11 +919,12 @@ rrmProcessBeaconReportXmit( tpAniSirGlobal pMac,
 
    if( pBcnReport->fMeasureDone )
    {
-      PELOGE(limLog( pMac, LOGE, "Measurement done....cleanup the context");)
+      limLog( pMac, LOG3, "Measurement done....cleanup the context");
+
       rrmCleanup(pMac);
    }
 
-   if( NULL != pReport)
+   if( NULL != pReport )
       vos_mem_free(pReport);
 
    return status;
@@ -980,7 +956,9 @@ void rrmProcessBeaconRequestFailure(tpAniSirGlobal pMac, tpPESession pSessionEnt
             pReport->incapable = 1;
             break;
         default:
-            PELOGE(limLog( pMac, LOGE, FL(" Beacon request processing failed no report sent with status %d "), status););
+            PELOGE(limLog( pMac, LOGE,
+             FL(" Beacon request processing failed no report sent with status %d "),
+             status););
             vos_mem_free(pReport);
             return;
     }
@@ -989,9 +967,7 @@ void rrmProcessBeaconRequestFailure(tpAniSirGlobal pMac, tpPESession pSessionEnt
                                                         pReport, peer, pSessionEntry );
 
     vos_mem_free(pReport);
-#if defined WLAN_VOWIFI_DEBUG
-    PELOGE(limLog( pMac, LOGE, FL(" Free memory for pReport") );)
-#endif
+    limLog( pMac, LOG3, FL(" Free memory for pReport") );
     return;
 }
 
@@ -1039,21 +1015,23 @@ rrmProcessRadioMeasurementRequest( tpAniSirGlobal pMac,
          return eSIR_MEM_ALLOC_FAILED;
       }
       vos_mem_set(pReport, sizeof(tSirMacRadioMeasureReport),0);
-#if defined WLAN_VOWIFI_DEBUG
-      PELOGE(limLog( pMac, LOGE, FL(" Allocated memory for pReport") );)
-#endif
+      PELOGE(limLog( pMac, LOGE,
+      FL("No requestIes in the measurement request, sending incapable report"));)
       pReport->incapable = 1;
       num_report = 1;
       limSendRadioMeasureReportActionFrame( pMac, pRRMReq->DialogToken.token, num_report,
                   pReport, peer, pSessionEntry );
       vos_mem_free(pReport);
-      PELOGE(limLog( pMac, LOGE, "No requestIes in the measurement request" );)
       return eSIR_FAILURE;
    }
 
    // PF Fix
    if( pRRMReq->NumOfRepetitions.repetitions > 0 )
    {
+      limLog( pMac, LOG1,
+                     FL(" number of repetitions %d"),
+                     pRRMReq->NumOfRepetitions.repetitions );
+
       //Send a report with incapable bit set. Not supporting repetitions.
       pReport = vos_mem_malloc(sizeof( tSirMacRadioMeasureReport ));
       if ( NULL == pReport )
@@ -1063,9 +1041,7 @@ rrmProcessRadioMeasurementRequest( tpAniSirGlobal pMac,
          return eSIR_MEM_ALLOC_FAILED;
       }
       vos_mem_set(pReport, sizeof(tSirMacRadioMeasureReport), 0);
-#if defined WLAN_VOWIFI_DEBUG
       PELOGE(limLog( pMac, LOGE, FL(" Allocated memory for pReport") );)
-#endif
       pReport->incapable = 1;
       pReport->type = pRRMReq->MeasurementRequest[0].measurement_type;
       num_report = 1;
@@ -1095,9 +1071,9 @@ rrmProcessRadioMeasurementRequest( tpAniSirGlobal pMac,
                               sizeof( tSirMacRadioMeasureReport )
                               * (pRRMReq->num_MeasurementRequest - i),
                               0);
-#if defined WLAN_VOWIFI_DEBUG
-                  limLog( pMac, LOGE, FL(" Allocated memory for pReport") );
-#endif
+                  limLog( pMac, LOG3,
+                         FL(" rrm beacon type refused of %d report in beacon table"),
+                         num_report );
 
                }
                pReport[num_report].refused = 1;
@@ -1116,9 +1092,7 @@ rrmProcessRadioMeasurementRequest( tpAniSirGlobal pMac,
                   vos_mem_free(pReport);
                   return eSIR_MEM_ALLOC_FAILED;
                }
-#if defined WLAN_VOWIFI_DEBUG
-               PELOGE(limLog( pMac, LOGE, FL(" Allocated memory for pCurrentReq") );)
-#endif
+               limLog( pMac, LOG3, FL(" Processing Beacon Report request") );
                 vos_mem_set(pCurrentReq, sizeof( *pCurrentReq ), 0);
                pCurrentReq->dialog_token = pRRMReq->DialogToken.token;
                pCurrentReq->token = pRRMReq->MeasurementRequest[i].measurement_token;
@@ -1148,10 +1122,9 @@ rrmProcessRadioMeasurementRequest( tpAniSirGlobal pMac,
                            sizeof( tSirMacRadioMeasureReport )
                            * (pRRMReq->num_MeasurementRequest - i),
                            0);
-#if defined WLAN_VOWIFI_DEBUG
-               PELOGE(limLog( pMac, LOGE, FL(" Allocated memory for pReport") );)
-#endif
-
+                  limLog( pMac, LOG3,
+                         FL(" rrm beacon type incapble of %d report "),
+                         num_report );
             }
             pReport[num_report].incapable = 1;
             pReport[num_report].type = pRRMReq->MeasurementRequest[i].measurement_type;
@@ -1168,9 +1141,7 @@ end:
             pReport, peer, pSessionEntry );
 
       vos_mem_free(pReport);
-#if defined WLAN_VOWIFI_DEBUG
-      PELOGE(limLog( pMac, LOGE, FL(" Free memory for pReport") );)
-#endif
+      limLog( pMac, LOG3, FL(" Free memory for pReport") );
    }
    return status;
 
@@ -1291,10 +1262,10 @@ void rrmUpdateConfig ( tpAniSirGlobal pMac,
    }
    pRRMCaps->nonOperatingChanMax =(tANI_U8) val;
 
-#if defined WLAN_VOWIFI_DEBUG
-   PELOGE(limLog( pMac, LOGE, "RRM enabled = %d  OperatingChanMax = %d  NonOperatingMax = %d", pMac->rrm.rrmPEContext.rrmEnable,
-                     pRRMCaps->operatingChanMax, pRRMCaps->nonOperatingChanMax );)
-#endif
+   limLog( pMac, LOG1,
+          "RRM enabled = %d  OperatingChanMax = %d  NonOperatingMax = %d",
+          pMac->rrm.rrmPEContext.rrmEnable,
+          pRRMCaps->operatingChanMax, pRRMCaps->nonOperatingChanMax );
 }
 // --------------------------------------------------------------------
 /**
@@ -1365,15 +1336,11 @@ rrmCleanup(tpAniSirGlobal pMac)
       if( pMac->rrm.rrmPEContext.pCurrentReq->request.Beacon.reqIes.pElementIds )
       {
          vos_mem_free(pMac->rrm.rrmPEContext.pCurrentReq->request.Beacon.reqIes.pElementIds);
-#if defined WLAN_VOWIFI_DEBUG
-         PELOGE(limLog( pMac, LOGE, FL(" Free memory for pElementIds") );)
-#endif
+         limLog( pMac, LOG4, FL(" Free memory for pElementIds") );
       }
 
       vos_mem_free(pMac->rrm.rrmPEContext.pCurrentReq);
-#if defined WLAN_VOWIFI_DEBUG
-      PELOGE(limLog( pMac, LOGE, FL(" Free memory for pCurrentReq") );)
-#endif
+      limLog( pMac, LOG4, FL(" Free memory for pCurrentReq") );
    }
 
    pMac->rrm.rrmPEContext.pCurrentReq = NULL;