diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 84fa434b9cbc..559f5a65b475 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -1122,7 +1122,7 @@ hdd_send_new_ap_channel_info(struct net_device *dev, struct hdd_adapter *adapter
 			     tCsrRoamInfo *pCsrRoamInfo)
 {
 	union iwreq_data wrqu;
-	tSirBssDescription *descriptor = pCsrRoamInfo->pBssDesc;
+	struct bss_description *descriptor = pCsrRoamInfo->pBssDesc;
 
 	if (descriptor == NULL) {
 		hdd_err("bss descriptor is null");
@@ -1943,7 +1943,7 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
 					tCsrRoamInfo *roam_info,
 					uint8_t staId,
 					struct qdf_mac_addr *pPeerMacAddress,
-					tSirBssDescription *pBssDesc)
+					struct bss_description *pBssDesc)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
 	struct ol_txrx_desc_type staDesc = { 0 };
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 94a9b4d807ca..45bf1d012909 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -14627,8 +14627,9 @@ wlan_hdd_cfg80211_inform_bss_frame_data(struct wiphy *wiphy,
  *
  * Return: struct cfg80211_bss pointer
  */
-struct cfg80211_bss *wlan_hdd_cfg80211_inform_bss_frame(struct hdd_adapter *adapter,
-						tSirBssDescription *bss_desc)
+struct cfg80211_bss *
+wlan_hdd_cfg80211_inform_bss_frame(struct hdd_adapter *adapter,
+				   struct bss_description *bss_desc)
 {
 	/*
 	 * cfg80211_inform_bss() is not updating ie field of bss entry, if entry
diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h
index 75eda7493253..d8573374ae0b 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.h
+++ b/core/hdd/src/wlan_hdd_cfg80211.h
@@ -422,8 +422,9 @@ static inline void wlan_hdd_cfg80211_indicate_disconnect(struct net_device *dev,
 				GFP_KERNEL);
 }
 #endif
-struct cfg80211_bss *wlan_hdd_cfg80211_inform_bss_frame(struct hdd_adapter *adapter,
-						tSirBssDescription *bss_desc);
+struct cfg80211_bss *
+wlan_hdd_cfg80211_inform_bss_frame(struct hdd_adapter *adapter,
+				   struct bss_description *bss_desc);
 
 /**
  * hdd_rate_info_bw: an HDD internal rate bandwidth representation
diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c
index 22e069b62d32..1d2275b52ff6 100644
--- a/core/hdd/src/wlan_hdd_nan_datapath.c
+++ b/core/hdd/src/wlan_hdd_nan_datapath.c
@@ -881,7 +881,7 @@ static void hdd_ndp_iface_create_rsp_handler(struct hdd_adapter *adapter,
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	struct qdf_mac_addr bc_mac_addr = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
 	tCsrRoamInfo *roam_info;
-	tSirBssDescription tmp_bss_descp = {0};
+	struct bss_description tmp_bss_descp = {0};
 
 	ENTER();
 
@@ -1240,7 +1240,7 @@ static void hdd_ndp_new_peer_ind_handler(struct hdd_adapter *adapter,
 {
 	struct sme_ndp_peer_ind *new_peer_ind = ind_params;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	tSirBssDescription tmp_bss_descp = {0};
+	struct bss_description tmp_bss_descp = {0};
 	tCsrRoamInfo *roam_info;
 	struct nan_datapath_ctx *ndp_ctx = WLAN_HDD_GET_NDP_CTX_PTR(adapter);
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
@@ -2280,7 +2280,7 @@ void hdd_ndi_drv_ndi_create_rsp_handler(uint8_t vdev_id,
 				struct nan_datapath_inf_create_rsp *ndi_rsp)
 {
 	tCsrRoamInfo roam_info = {0};
-	tSirBssDescription tmp_bss_descp = {0};
+	struct bss_description tmp_bss_descp = {0};
 	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	struct hdd_adapter *adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
 	struct qdf_mac_addr bc_mac_addr = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
@@ -2353,7 +2353,7 @@ int hdd_ndp_new_peer_handler(uint8_t vdev_id, uint16_t sta_id,
 {
 	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	struct hdd_adapter *adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
-	tSirBssDescription tmp_bss_descp = {0};
+	struct bss_description tmp_bss_descp = {0};
 	tCsrRoamInfo roam_info = {0};
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);