diff --git a/core/dp/ol/inc/ol_txrx_osif_api.h b/core/dp/ol/inc/ol_txrx_osif_api.h
index 203f27743e9c..3d2d7853e67e 100644
--- a/core/dp/ol/inc/ol_txrx_osif_api.h
+++ b/core/dp/ol/inc/ol_txrx_osif_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012, 2014-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -69,7 +69,7 @@ qdf_nbuf_t ol_txrx_osif_tso_segment(ol_txrx_vdev_handle txrx_vdev,
 				    int max_seg_payload_bytes,
 				    qdf_nbuf_t jumbo_tcp_frame);
 
-qdf_nbuf_t ol_tx_data(void *data_vdev, qdf_nbuf_t skb);
+qdf_nbuf_t ol_tx_data(struct cdp_vdev *data_vdev, qdf_nbuf_t skb);
 
 void ol_rx_data_process(struct ol_txrx_peer_t *peer,
 			qdf_nbuf_t rx_buf_list);
diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c
index 41bfdd3fd3b1..a65d95cc3510 100644
--- a/core/dp/txrx/ol_tx.c
+++ b/core/dp/txrx/ol_tx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -48,11 +48,11 @@
  *
  * Return: skb/NULL for success
  */
-qdf_nbuf_t ol_tx_data(void *data_vdev, qdf_nbuf_t skb)
+qdf_nbuf_t ol_tx_data(struct cdp_vdev *data_vdev, qdf_nbuf_t skb)
 {
 	struct ol_txrx_pdev_t *pdev;
 	qdf_nbuf_t ret;
-	ol_txrx_vdev_handle vdev = data_vdev;
+	ol_txrx_vdev_handle vdev = (struct ol_txrx_vdev_t *)data_vdev;
 
 	if (qdf_unlikely(!vdev)) {
 		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG,
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 699f473101df..cfed2a2e36be 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -1171,7 +1171,7 @@ struct hdd_adapter {
 	qdf_spinlock_t vdev_lock;
 	uint8_t vdev_id;
 
-	void *txrx_vdev;
+	struct cdp_vdev *txrx_vdev;
 
 	/** Handle to the network device */
 	struct net_device *dev;
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 656a683acd35..640b7659b632 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -2156,7 +2156,7 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
 
 	txrx_ops.rx.stats_rx = hdd_tx_rx_collect_connectivity_stats_info;
 
-	adapter->txrx_vdev = (void *)cdp_get_vdev_from_vdev_id(soc,
+	adapter->txrx_vdev = cdp_get_vdev_from_vdev_id(soc,
 				(struct cdp_pdev *)pdev,
 				adapter->vdev_id);
 	if (!adapter->txrx_vdev) {
@@ -2165,7 +2165,7 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
 
 	txrx_ops.tx.tx = NULL;
 	cdp_vdev_register(soc,
-		(struct cdp_vdev *)adapter->txrx_vdev, adapter,
+		adapter->txrx_vdev, adapter,
 		(struct cdp_ctrl_objmgr_vdev *)adapter->vdev, &txrx_ops);
 	if (!txrx_ops.tx.tx) {
 		hdd_err("%s vdev register fail", __func__);
diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c
index 7346fa161156..2502c1555f30 100644
--- a/core/hdd/src/wlan_hdd_softap_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c
@@ -1110,7 +1110,7 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
 			  adapter,
 			  (struct cdp_ctrl_objmgr_vdev *)adapter->vdev,
 			  &txrx_ops);
-	adapter->txrx_vdev = (void *)cdp_get_vdev_from_vdev_id(soc,
+	adapter->txrx_vdev = cdp_get_vdev_from_vdev_id(soc,
 					(struct cdp_pdev *)pdev,
 					adapter->vdev_id);
 	adapter->tx_fn = txrx_ops.tx.tx;
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index 00cfad0b9be9..a14c3dc06828 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -6688,7 +6688,7 @@ static QDF_STATUS wma_update_hw_mode_list(t_wma_handle *wma_handle,
 static void wma_init_wifi_pos_dma_rings(t_wma_handle *wma_handle,
 					uint8_t num_mac, void *buf)
 {
-	struct hif_softc *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
+	struct hif_opaque_softc *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
 	void *hal_soc;
 
 	if (!hif_ctx) {