Merge "qca-wifi: Smart Antenna multi radio support"
diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c
index 0871731..a5ea482 100644
--- a/wmi/src/wmi_unified_non_tlv.c
+++ b/wmi/src/wmi_unified_non_tlv.c
@@ -8070,13 +8070,14 @@
  * @wmi_handle: wmi handle
  * @param evt_buf: pointer to event buffer
  * @param peer_mac: Pointer to hold peer mac address
+ * @param pdev_id: Pointer to hold pdev_id
  * @param rate_cap: Pointer to hold ratecode
  *
  * Return: 0 for success or error code
  */
 static QDF_STATUS extract_peer_ratecode_list_ev_non_tlv(wmi_unified_t wmi_handle,
 		void *evt_buf,
-		uint8_t *peer_mac, wmi_sa_rate_cap *rate_cap)
+		uint8_t *peer_mac, uint32_t *pdev_id, wmi_sa_rate_cap *rate_cap)
 {
 	wmi_peer_ratecode_list_event_t *rate_event =
 	    (wmi_peer_ratecode_list_event_t *)evt_buf;
@@ -8084,6 +8085,7 @@
 	uint8_t shift = 0;
 
 	WMI_MAC_ADDR_TO_CHAR_ARRAY(&rate_event->peer_macaddr, peer_mac);
+	*pdev_id = WMI_NON_TLV_DEFAULT_PDEV_ID;
 
 	htindex = 0;
 	rate_cap->ratecount[0] =
diff --git a/wmi/src/wmi_unified_smart_ant_tlv.c b/wmi/src/wmi_unified_smart_ant_tlv.c
index cb8dd34..f9d9e57 100644
--- a/wmi/src/wmi_unified_smart_ant_tlv.c
+++ b/wmi/src/wmi_unified_smart_ant_tlv.c
@@ -486,6 +486,7 @@
  * @wmi_handle: wmi handle
  * @param evt_buf: pointer to event buffer
  * @param peer_mac: Pointer to hold peer mac address
+ * @param pdev_id: Pointer to pdev_id
  * @param rate_cap: Pointer to hold ratecode
  *
  * @return QDF_STATUS_SUCCESS on success or error code
@@ -494,6 +495,7 @@
 				wmi_unified_t wmi_handle,
 				void *evt_buf,
 				uint8_t *peer_mac,
+				uint32_t *pdev_id,
 				wmi_sa_rate_cap *rate_cap)
 {
 	WMI_PEER_RATECODE_LIST_EVENTID_param_tlvs *param_buf;
@@ -506,6 +508,7 @@
 	param_buf = (WMI_PEER_RATECODE_LIST_EVENTID_param_tlvs *)evt_buf;
 	ev = (wmi_peer_ratecode_list_event_fixed_param *)param_buf->fixed_param;
 	WMI_MAC_ADDR_TO_CHAR_ARRAY(&ev->peer_macaddr, peer_mac);
+	*pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(ev->pdev_id);
 
 	for (i = 0; i < SA_BYTES_IN_DWORD; i++) {
 		rate_cap->ratecount[i] = ((ev->ratecount >> (i*8)) &