qcacld: Pass IBSS peer mac address received from target

Pass mac address received from target in IBSS peer info event to
user space. And addition remove pronto specific rate conversion
logic as ROME FW returns data rate in Mbps directly

Change-Id: Id89e9f357831f242c43fc8ce121de18a3180e422
CRs-Fixed: 777960

6 files changed, 101 insertions, 186 deletions

diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index bcd6efb645b2..86c35a3d30a3 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -677,30 +677,6 @@ typedef enum{
     HDD_SSR_DISABLED,
 }e_hdd_ssr_required;
 
-/*---------------------------------------------------------------------------
-  hdd_ibss_peer_info_params_t
----------------------------------------------------------------------------*/
-typedef struct
-{
-    v_U8_t  staIdx;       //StaIdx
-    v_U32_t txRate;       //Current Tx Rate
-    v_U32_t mcsIndex;     //MCS Index
-    v_U32_t txRateFlags;  //TxRate Flags
-    v_S7_t  rssi;         //RSSI
-}hdd_ibss_peer_info_params_t;
-
-typedef struct
-{
-    /** Request status */
-    v_U32_t                       status;
-
-    /** Number of peers */
-    v_U8_t                        numIBSSPeers;
-
-    /** Peer Info parameters */
-    hdd_ibss_peer_info_params_t  ibssPeerList[HDD_MAX_NUM_IBSS_STA];
-}hdd_ibss_peer_info_t;
-
 struct hdd_station_ctx
 {
   /** Handle to the Wireless Extension State */
@@ -731,7 +707,7 @@ struct hdd_station_ctx
 
    /*Save the wep/wpa-none keys*/
    tCsrRoamSetKey ibss_enc_key;
-   hdd_ibss_peer_info_t ibss_peer_info;
+   tSirPeerInfoRspParams ibss_peer_info;
 
    v_BOOL_t hdd_ReassocScenario;
 
@@ -2028,5 +2004,8 @@ static inline void wlan_hdd_set_egap_support(hdd_context_t *hdd_ctx,
 
 int wlan_hdd_update_txrx_chain_mask(hdd_context_t *hdd_ctx,
 				    uint8_t chain_mask);
+void
+hdd_get_ibss_peer_info_cb(v_VOID_t *pUserData,
+                                    tSirPeerInfoRspParams *pPeerInfo);
 
 #endif    // end #if !defined( WLAN_HDD_MAIN_H )
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 1555d21d5e26..218435ae0913 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1491,24 +1491,22 @@ static int hdd_parse_setrmcrate_command(tANI_U8 *pValue,
     return 0;
 }
 
-/**---------------------------------------------------------------------------
-
-  \brief hdd_cfg80211_get_ibss_peer_info_cb() - Callback function for IBSS
-  Peer Info request
-
-  This is an asynchronous callback function from SME when the peer info
-  is received
 
-  \pUserData -> Adapter private data
-  \pPeerInfoRsp -> Peer info response
-
-  \return - 0 for success non-zero for failure
-  --------------------------------------------------------------------------*/
-static void
-hdd_cfg80211_get_ibss_peer_info_cb(v_VOID_t *pUserData, v_VOID_t *pPeerInfoRsp)
+/**
+ * hdd_get_ibss_peer_info_cb() - IBSS peer Info request callback
+ * @UserData: Adapter private data
+ * @pPeerInfoRsp: Peer info response
+ *
+ * This is an asynchronous callback function from SME when the peer info
+ * is received
+ *
+ * Return: 0 for success non-zero for failure
+ */
+void
+hdd_get_ibss_peer_info_cb(v_VOID_t *pUserData,
+                          tSirPeerInfoRspParams *pPeerInfo)
 {
    hdd_adapter_t *pAdapter = (hdd_adapter_t *)pUserData;
-   hdd_ibss_peer_info_t *pPeerInfo = (hdd_ibss_peer_info_t *)pPeerInfoRsp;
    hdd_station_ctx_t *pStaCtx;
    v_U8_t   i;
 
@@ -1521,21 +1519,20 @@ hdd_cfg80211_get_ibss_peer_info_cb(v_VOID_t *pUserData, v_VOID_t *pPeerInfoRsp)
 
    pStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
    if (NULL != pPeerInfo && eHAL_STATUS_SUCCESS == pPeerInfo->status) {
-      pStaCtx->ibss_peer_info.status = pPeerInfo->status;
-      pStaCtx->ibss_peer_info.numIBSSPeers = pPeerInfo->numIBSSPeers;
-
-      /* Paranoia check */
-      if (pPeerInfo->numIBSSPeers < HDD_MAX_NUM_IBSS_STA) {
-         for (i = 0; i < pPeerInfo->numIBSSPeers; i++) {
-             memcpy(&pStaCtx->ibss_peer_info.ibssPeerList[i],
-                    &pPeerInfo->ibssPeerList[i],
-                    sizeof(hdd_ibss_peer_info_params_t));
+      /* validate number of peers */
+      if (pPeerInfo->numPeers < HDD_MAX_NUM_IBSS_STA) {
+         pStaCtx->ibss_peer_info.status = pPeerInfo->status;
+         pStaCtx->ibss_peer_info.numPeers = pPeerInfo->numPeers;
+
+         for (i = 0; i < pPeerInfo->numPeers; i++) {
+             pStaCtx->ibss_peer_info.peerInfoParams[i] =
+                                         pPeerInfo->peerInfoParams[i];
          }
          hddLog(LOG1, FL("Peer Info copied in HDD"));
       } else {
          hddLog(LOG1,
                 FL("Number of peers %d returned is more than limit %d"),
-                pPeerInfo->numIBSSPeers, HDD_MAX_NUM_IBSS_STA);
+                pPeerInfo->numPeers, HDD_MAX_NUM_IBSS_STA);
       }
    } else {
       hddLog(LOG1, FL("peerInfo returned is NULL"));
@@ -1564,7 +1561,7 @@ VOS_STATUS hdd_cfg80211_get_ibss_peer_info_all(hdd_adapter_t *pAdapter)
    INIT_COMPLETION(pAdapter->ibss_peer_info_comp);
 
    retStatus = sme_RequestIBSSPeerInfo(hHal, pAdapter,
-                                    hdd_cfg80211_get_ibss_peer_info_cb,
+                                    hdd_get_ibss_peer_info_cb,
                                     VOS_TRUE, 0xFF);
 
    if (VOS_STATUS_SUCCESS == retStatus)
@@ -1611,7 +1608,7 @@ hdd_cfg80211_get_ibss_peer_info(hdd_adapter_t *pAdapter, v_U8_t staIdx)
     INIT_COMPLETION(pAdapter->ibss_peer_info_comp);
 
     retStatus = sme_RequestIBSSPeerInfo(hHal, pAdapter,
-                                     hdd_cfg80211_get_ibss_peer_info_cb,
+                                     hdd_get_ibss_peer_info_cb,
                                      VOS_FALSE, staIdx);
 
     if (VOS_STATUS_SUCCESS == retStatus)
@@ -7015,8 +7012,8 @@ static int hdd_driver_command(hdd_adapter_t *pAdapter,
          hdd_station_ctx_t *pHddStaCtx = NULL;
          char *extra = NULL;
          int idx = 0, length = 0;
-         v_MACADDR_t *macAddr;
-         v_U32_t txRateMbps = 0, numOfBytestoPrint = 0;
+         uint8_t mac_addr[VOS_MAC_ADDR_SIZE];
+         v_U32_t numOfBytestoPrint = 0;
 
          if (WLAN_HDD_IBSS == pAdapter->device_mode)
          {
@@ -7055,42 +7052,34 @@ static int hdd_driver_command(hdd_adapter_t *pAdapter,
 
             /* Copy number of stations */
             length = scnprintf( extra, WLAN_MAX_BUF_SIZE, "%d ",
-                             pHddStaCtx->ibss_peer_info.numIBSSPeers);
+                             pHddStaCtx->ibss_peer_info.numPeers);
             numOfBytestoPrint = length;
-            for (idx = 0; idx < pHddStaCtx->ibss_peer_info.numIBSSPeers; idx++)
-            {
-               macAddr =
-                       hdd_wlan_get_ibss_mac_addr_from_staid(pAdapter,
-                                         pHddStaCtx->ibss_peer_info.ibssPeerList[idx].staIdx);
-               if (NULL != macAddr)
-               {
-                  txRateMbps =
-                     ((pHddStaCtx->ibss_peer_info.ibssPeerList[idx].txRate)*500*1000)/1000000;
-
-                  length += scnprintf( (extra + length), WLAN_MAX_BUF_SIZE - length,
-                                  "%02x:%02x:%02x:%02x:%02x:%02x %d %d ",
-                                  macAddr->bytes[0], macAddr->bytes[1], macAddr->bytes[2],
-                                  macAddr->bytes[3], macAddr->bytes[4], macAddr->bytes[5],
-                                  (int)txRateMbps,
-                                  (int)pHddStaCtx->ibss_peer_info.ibssPeerList[idx].rssi);
-               }
-               else
-               {
-                  VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                             "%s: MAC ADDR is NULL for staIdx: %d", __func__,
-                             pHddStaCtx->ibss_peer_info.ibssPeerList[idx].staIdx);
-               }
-
-               /*
-                * VOS_TRACE() macro has limitation of 512 bytes for the print
-                * buffer. Hence printing the data in two chunks. The first chunk
-                * will have the data for 16 devices and the second chunk will
-                * have the rest.
-                */
-               if (idx < NUM_OF_STA_DATA_TO_PRINT)
-               {
-                   numOfBytestoPrint = length;
-               }
+            for (idx = 0; idx < pHddStaCtx->ibss_peer_info.numPeers; idx++) {
+               int8_t rssi;
+               uint32_t tx_rate;
+
+               vos_mem_copy(mac_addr,
+                  pHddStaCtx->ibss_peer_info.peerInfoParams[idx].mac_addr,
+                  sizeof(mac_addr));
+
+                  tx_rate =
+                     pHddStaCtx->ibss_peer_info.peerInfoParams[idx].txRate;
+                  rssi = pHddStaCtx->ibss_peer_info.peerInfoParams[idx].rssi;
+
+                  length += scnprintf((extra + length),
+                            WLAN_MAX_BUF_SIZE - length,
+                            "%02x:%02x:%02x:%02x:%02x:%02x %d %d ",
+                            mac_addr[0], mac_addr[1], mac_addr[2],
+                            mac_addr[3], mac_addr[4], mac_addr[5],
+                            tx_rate, rssi);
+                 /*
+                  * VOS_TRACE() macro has limitation of 512 bytes for the print
+                  * buffer. Hence printing the data in two chunks. The first
+                  * chunk will have the data for 16 devices and the second
+                  * chunk will have the rest.
+                  */
+                  if (idx < NUM_OF_STA_DATA_TO_PRINT)
+                       numOfBytestoPrint = length;
             }
 
             /*
@@ -7148,7 +7137,6 @@ static int hdd_driver_command(hdd_adapter_t *pAdapter,
          char extra[128] = { 0 };
          v_U32_t length = 0;
          v_U8_t staIdx = 0;
-         v_U32_t txRateMbps = 0;
          v_MACADDR_t peerMacAddr;
 
          if (WLAN_HDD_IBSS == pAdapter->device_mode)
@@ -7186,7 +7174,7 @@ static int hdd_driver_command(hdd_adapter_t *pAdapter,
             goto exit;
          }
 
-         /* Get station index for the peer mac address */
+         /* Get station index for the peer mac address and sanitize it */
          hdd_Ibss_GetStaId(pHddStaCtx, &peerMacAddr, &staIdx);
 
          if (staIdx > HDD_MAX_NUM_IBSS_STA)
@@ -7201,11 +7189,10 @@ static int hdd_driver_command(hdd_adapter_t *pAdapter,
          status = hdd_cfg80211_get_ibss_peer_info(pAdapter, staIdx);
          if (VOS_STATUS_SUCCESS == status)
          {
-            v_U32_t txRate = pHddStaCtx->ibss_peer_info.ibssPeerList[0].txRate;
-            txRateMbps = (txRate * 500 * 1000)/1000000;
+           v_U32_t txRate = pHddStaCtx->ibss_peer_info.peerInfoParams[0].txRate;
 
-            length = scnprintf( extra, sizeof(extra), "%d %d", (int)txRateMbps,
-                            (int)pHddStaCtx->ibss_peer_info.ibssPeerList[0].rssi);
+           length = scnprintf( extra, sizeof(extra), "%d %d", (int)txRate,
+                      (int)pHddStaCtx->ibss_peer_info.peerInfoParams[0].rssi);
 
             /* Copy the data back into buffer */
             if (copy_to_user(priv_data.buf, &extra, length+ 1))
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 6b81c68893ce..1e22425dde67 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -865,32 +865,6 @@ error:
     return;
 }
 
-void hdd_get_ibss_peer_info_cb(v_VOID_t *pUserData, v_VOID_t *pPeerInfoRsp)
-{
-   hdd_adapter_t *pAdapter = (hdd_adapter_t *)pUserData;
-   hdd_ibss_peer_info_t *pPeerInfo = (hdd_ibss_peer_info_t *)pPeerInfoRsp;
-   hdd_station_ctx_t *pStaCtx =  WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
-   v_U8_t   i;
-
-   if (NULL != pPeerInfo && eHAL_STATUS_SUCCESS == pPeerInfo->status)
-   {
-      pStaCtx->ibss_peer_info.status = pPeerInfo->status;
-      pStaCtx->ibss_peer_info.numIBSSPeers = pPeerInfo->numIBSSPeers;
-      for (i = 0; i < pPeerInfo->numIBSSPeers; i++)
-      {
-         memcpy(&pStaCtx->ibss_peer_info.ibssPeerList[i],
-                &pPeerInfo->ibssPeerList[i], sizeof(hdd_ibss_peer_info_params_t));
-      }
-   }
-   else
-   {
-      VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
-                    "%s] PEER_INFO_CMD_STATUS is not SUCCESS", __func__);
-   }
-
-   complete(&pAdapter->ibss_peer_info_comp);
-}
-
 v_MACADDR_t* hdd_wlan_get_ibss_mac_addr_from_staid(hdd_adapter_t *pAdapter, v_U8_t staIdx)
 {
    v_U8_t idx;
@@ -912,7 +886,7 @@ eHalStatus hdd_wlan_get_ibss_peer_info(hdd_adapter_t *pAdapter, v_U8_t staIdx)
     eHalStatus status = eHAL_STATUS_FAILURE;
     tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
     hdd_station_ctx_t *pStaCtx =  WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
-    hdd_ibss_peer_info_t *pPeerInfo = &pStaCtx->ibss_peer_info;
+    tSirPeerInfoRspParams *pPeerInfo = &pStaCtx->ibss_peer_info;
 
     status = sme_RequestIBSSPeerInfo(hHal, pAdapter, hdd_get_ibss_peer_info_cb,
                                      VOS_FALSE, staIdx);
@@ -932,24 +906,16 @@ eHalStatus hdd_wlan_get_ibss_peer_info(hdd_adapter_t *pAdapter, v_U8_t staIdx)
        }
 
        /** Print the peer info */
-       pr_info("pPeerInfo->numIBSSPeers = %d ", pPeerInfo->numIBSSPeers);
+       pr_info("pPeerInfo->numIBSSPeers = %d ", pPeerInfo->numPeers);
        pr_info("============================================================");
        {
-          v_MACADDR_t *macAddr = hdd_wlan_get_ibss_mac_addr_from_staid(pAdapter,
-                                 staIdx);
-          v_U32_t  txRateMbps = ((pPeerInfo->ibssPeerList[0].txRate)*500*1000)/1000000;
+          uint8_t mac_addr[VOS_MAC_ADDR_SIZE];
+          uint32_t tx_rate = pPeerInfo->peerInfoParams[0].txRate;
 
-          if (NULL != macAddr)
-          {
-             pr_info("PEER ADDR :" MAC_ADDRESS_STR " TxRate: %d Mbps  RSSI: %d",
-                     MAC_ADDR_ARRAY(macAddr->bytes),
-                      (int)txRateMbps, (int)pPeerInfo->ibssPeerList[0].rssi);
-          }
-          else
-          {
-             VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                       " ERROR: PEER MAC ADDRESS NOT FOUND ");
-          }
+          vos_mem_copy(mac_addr, pPeerInfo->peerInfoParams[0].mac_addr,
+               sizeof(mac_addr));
+          pr_info("PEER ADDR : %pM TxRate: %d Mbps  RSSI: %d",
+             mac_addr, (int)tx_rate, (int)pPeerInfo->peerInfoParams[0].rssi);
        }
     }
     else
@@ -966,7 +932,7 @@ eHalStatus hdd_wlan_get_ibss_peer_info_all(hdd_adapter_t *pAdapter)
     eHalStatus status = eHAL_STATUS_FAILURE;
     tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
     hdd_station_ctx_t *pStaCtx =  WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
-    hdd_ibss_peer_info_t *pPeerInfo = &pStaCtx->ibss_peer_info;
+    tSirPeerInfoRspParams *pPeerInfo = &pStaCtx->ibss_peer_info;
     int i;
 
     status = sme_RequestIBSSPeerInfo(hHal, pAdapter, hdd_get_ibss_peer_info_cb,
@@ -986,27 +952,18 @@ eHalStatus hdd_wlan_get_ibss_peer_info_all(hdd_adapter_t *pAdapter)
        }
 
        /** Print the peer info */
-       pr_info("pPeerInfo->numIBSSPeers = %d ", (int)pPeerInfo->numIBSSPeers);
+       pr_info("pPeerInfo->numIBSSPeers = %d ", (int)pPeerInfo->numPeers);
        pr_info("============================================================");
-       for (i = 0; i < pPeerInfo->numIBSSPeers; i++)
-       {
-          v_U8_t staIdx = pPeerInfo->ibssPeerList[i].staIdx;
-          v_MACADDR_t *macAddr = hdd_wlan_get_ibss_mac_addr_from_staid(pAdapter,
-                                                                       staIdx);
-          v_U32_t  txRateMbps = ((pPeerInfo->ibssPeerList[0].txRate)*500*1000)/1000000;
+       for (i = 0; i < pPeerInfo->numPeers; i++) {
+          uint8_t mac_addr[VOS_MAC_ADDR_SIZE];
+          uint32_t tx_rate;
 
-          pr_info("STAIDX:%d ", (int)pPeerInfo->ibssPeerList[i].staIdx);
-          if (NULL != macAddr)
-          {
-             pr_info(" PEER ADDR :" MAC_ADDRESS_STR " TxRate: %d Mbps RSSI: %d",
-                     MAC_ADDR_ARRAY(macAddr->bytes),
-                     (int)txRateMbps, (int)pPeerInfo->ibssPeerList[i].rssi);
-          }
-          else
-          {
-             VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                       " ERROR: PEER MAC ADDRESS NOT FOUND ");
-          }
+          tx_rate = pPeerInfo->peerInfoParams[i].txRate;
+          vos_mem_copy(mac_addr, pPeerInfo->peerInfoParams[i].mac_addr,
+              sizeof(mac_addr));
+
+          pr_info(" PEER ADDR : %pM TxRate: %d Mbps RSSI: %d",
+            mac_addr, (int)tx_rate, (int)pPeerInfo->peerInfoParams[i].rssi);
        }
     }
     else
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 5c13d054760f..49fed9e2b2ac 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -4608,16 +4608,20 @@ typedef struct
                                      // of peer with staIdx is reported
 }tSirIbssGetPeerInfoReqParams, *tpSirIbssGetPeerInfoReqParams;
 
-/*---------------------------------------------------------------------------
-* tSirIbssGetPeerInfoParams
-*--------------------------------------------------------------------------*/
-typedef struct
-{
-   tANI_U8  staIdx;      //StaIdx
-   tANI_U32 txRate;       //Tx Rate
-   tANI_U32 mcsIndex;    //MCS Index
-   tANI_U32 txRateFlags; //TxRate Flags
-   tANI_S8  rssi;        //RSSI
+/**
+ * typedef struct - tSirIbssGetPeerInfoParams
+ * @mac_addr: mac address received from target
+ * @txRate: TX rate
+ * @mcsIndex: MCS index
+ * @txRateFlags: TX rate flags
+ * @rssi: RSSI
+ */
+typedef struct {
+   uint8_t  mac_addr[VOS_MAC_ADDR_SIZE];
+   uint32_t txRate;
+   uint32_t mcsIndex;
+   uint32_t txRateFlags;
+   int8_t  rssi;
 }tSirIbssPeerInfoParams;
 
 typedef struct
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index b2a1e62975a8..7bd95097727b 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -29711,14 +29711,13 @@ static int wma_ibss_peer_info_event_handler(void *handle, u_int8_t *data,
     vos_msg_t vosMsg;
     wmi_peer_info *peer_info;
     ol_txrx_pdev_handle pdev;
-    struct ol_txrx_peer_t *peer;
     tSirIbssPeerInfoParams *pSmeRsp;
     u_int32_t count, num_peers, status;
     tSirIbssGetPeerInfoRspParams *pRsp;
     tp_wma_handle wma = (tp_wma_handle) handle;
     WMI_PEER_INFO_EVENTID_param_tlvs *param_tlvs;
     wmi_peer_info_event_fixed_param *fix_param;
-    u_int8_t peer_mac[IEEE80211_ADDR_LEN], staIdx;
+    u_int8_t peer_mac[IEEE80211_ADDR_LEN];
 
     pdev = vos_get_context(VOS_MODULE_ID_TXRX, wma->vos_context);
     if (NULL == pdev) {
@@ -29756,27 +29755,15 @@ static int wma_ibss_peer_info_event_handler(void *handle, u_int8_t *data,
         pSmeRsp = &pRsp->ibssPeerInfoRspParams.peerInfoParams[count];
 
         WMI_MAC_ADDR_TO_CHAR_ARRAY (&peer_info->peer_mac_address, peer_mac);
-        peer = ol_txrx_find_peer_by_addr(pdev, peer_mac, &staIdx);
-        if (NULL == peer)
-        {
-            WMA_LOGE("%s: peer 0x:%2x:0x%2x:0x%2x:0x%2x:0x%2x:0x%2x does not"
-               " exist could not populate response", __func__, peer_mac[0],
-               peer_mac[1], peer_mac[2], peer_mac[3], peer_mac[4], peer_mac[5]);
-
-            pSmeRsp->staIdx = 0xff; /*fill invalid staIdx*/
-            peer_info++;
-            continue;
-        }
-        pSmeRsp->staIdx = staIdx;
+        vos_mem_copy(pSmeRsp->mac_addr, peer_mac,
+                              sizeof(pSmeRsp->mac_addr));
         pSmeRsp->mcsIndex = 0;
         pSmeRsp->rssi = peer_info->rssi + WMA_TGT_NOISE_FLOOR_DBM;
         pSmeRsp->txRate = peer_info->data_rate;
         pSmeRsp->txRateFlags = 0;
 
-        WMA_LOGE("%s: peer 0x:%2x:0x%2x:0x%2x:0x%2x:0x%2x:0x%2x staIdx %d "
-                 "rssi %d txRate %d", __func__, peer_mac[0], peer_mac[1],
-                 peer_mac[2], peer_mac[3], peer_mac[4], peer_mac[5], staIdx,
-                 pSmeRsp->rssi, pSmeRsp->txRate);
+        WMA_LOGE("%s: peer " MAC_ADDRESS_STR "rssi %d txRate %d", __func__,
+                MAC_ADDR_ARRAY(peer_mac), pSmeRsp->rssi, pSmeRsp->txRate);
 
         peer_info++;
     }
diff --git a/CORE/SME/inc/smeInternal.h b/CORE/SME/inc/smeInternal.h
index 4a39bc1ed2f5..fd5ac882ff99 100644
--- a/CORE/SME/inc/smeInternal.h
+++ b/CORE/SME/inc/smeInternal.h
@@ -112,7 +112,8 @@ typedef enum eSmeState
 #define SME_IS_READY(pMac)  (SME_STATE_READY == (pMac)->sme.state)
 
 /* HDD Callback function */
-typedef void(*pIbssPeerInfoCb)(void *pUserData, void *infoParam);
+typedef void(*pIbssPeerInfoCb)(void *pUserData,
+                               tSirPeerInfoRspParams *infoParam);
 
 /* Peer info */
 typedef struct tagSmePeerInfoHddCbkInfo