diff --git a/core/hdd/src/wlan_hdd_debugfs_llstat.c b/core/hdd/src/wlan_hdd_debugfs_llstat.c
index 1aeda1941240..6f92b9effbb3 100644
--- a/core/hdd/src/wlan_hdd_debugfs_llstat.c
+++ b/core/hdd/src/wlan_hdd_debugfs_llstat.c
@@ -42,7 +42,7 @@ void hdd_debugfs_process_iface_stats(struct hdd_adapter *adapter,
 		void *data, uint32_t num_peers)
 {
 	tpSirWifiIfaceStat iface_stat;
-	tpSirWifiInterfaceInfo iface_info;
+	struct wifi_interface_info *iface_info;
 	wmi_iface_link_stats *link_stats;
 	wmi_wmm_ac_stats *ac_stats;
 	wmi_iface_offload_stats *offload_stats;
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index eacc36fc9d80..920ae6c2bf30 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -367,7 +367,7 @@ static bool put_wifi_wmm_ac_stat(wmi_wmm_ac_stats *stats,
  *
  * Return: bool
  */
-static bool put_wifi_interface_info(tpSirWifiInterfaceInfo stats,
+static bool put_wifi_interface_info(struct wifi_interface_info *stats,
 				    struct sk_buff *vendor_event)
 {
 	if (nla_put_u32(vendor_event,
@@ -536,7 +536,7 @@ static tSirWifiInterfaceMode hdd_map_device_to_ll_iface_mode(int deviceMode)
 }
 
 bool hdd_get_interface_info(struct hdd_adapter *adapter,
-			    tpSirWifiInterfaceInfo pInfo)
+			    struct wifi_interface_info *pInfo)
 {
 	uint8_t *staMac = NULL;
 	struct hdd_station_ctx *sta_ctx;
diff --git a/core/hdd/src/wlan_hdd_stats.h b/core/hdd/src/wlan_hdd_stats.h
index 552114e19a90..bf5d8fc83d8b 100644
--- a/core/hdd/src/wlan_hdd_stats.h
+++ b/core/hdd/src/wlan_hdd_stats.h
@@ -150,7 +150,7 @@ int wlan_hdd_cfg80211_ll_stats_ext_set_param(struct wiphy *wiphy,
  * Return: bool
  */
 bool hdd_get_interface_info(struct hdd_adapter *adapter,
-			    tpSirWifiInterfaceInfo info);
+			    struct wifi_interface_info *info);
 
 /**
  * wlan_hdd_ll_stats_get() - Get Link Layer statistics from FW
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 77946eeef044..165759a726bd 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -3615,7 +3615,7 @@ typedef enum {
 /* set is 802.11 Country Element is present */
 #define WIFI_CAPABILITY_COUNTRY      0x00000020
 
-typedef struct {
+struct wifi_interface_info {
 	/* tSirWifiInterfaceMode */
 	/* interface mode */
 	uint8_t mode;
@@ -3637,7 +3637,7 @@ typedef struct {
 	uint8_t apCountryStr[CFG_COUNTRY_CODE_LEN];
 	/* country string for this association */
 	uint8_t countryStr[CFG_COUNTRY_CODE_LEN];
-} tSirWifiInterfaceInfo, *tpSirWifiInterfaceInfo;
+};
 
 /* channel information */
 typedef struct {
@@ -3787,7 +3787,7 @@ typedef struct {
  */
 typedef struct {
 	/* current state of the interface */
-	tSirWifiInterfaceInfo info;
+	struct wifi_interface_info info;
 
 	uint32_t rts_succ_cnt;
 	uint32_t rts_fail_cnt;
diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c
index 3efa41480600..362359128a00 100644
--- a/core/wma/src/wma_utils.c
+++ b/core/wma/src/wma_utils.c
@@ -2206,7 +2206,7 @@ int wma_unified_link_iface_stats_event_handler(void *handle,
 	}
 
 	link_stats_size = sizeof(tSirWifiIfaceStat);
-	iface_info_size = sizeof(tSirWifiInterfaceInfo);
+	iface_info_size = sizeof(struct wifi_interface_info);
 
 	ac_stats_size = sizeof(wmi_wmm_ac_stats);
 	offload_stats_size = sizeof(wmi_iface_offload_stats);
@@ -2232,7 +2232,7 @@ int wma_unified_link_iface_stats_event_handler(void *handle,
 
 	/* results is copied to tSirWifiIfaceStat in upper layer
 	 *   tSirWifiIfaceStat
-	 *    - tSirWifiInterfaceInfo (all fields except roaming is
+	 *    - struct wifi_interface_info (all fields except roaming is
 	 *                             filled by host in the upper layer)
 	 *    - various members of tSirWifiIfaceStat (from wmi_iface_link_stats)
 	 *    - ACs information (from wmi_wmm_ac_stats)