commit 3d2028618397e109f113c6b4f80cfd34ddd53b0e
author Komal Seelam <kseelam@codeaurora.org> Wed Feb 24 18:43:24 2016 +0530
committer Prakash Dhavali <pdhavali@codeaurora.org> Wed Mar 23 13:45:10 2016 -0700
tree 02345b6acdc4c559a9dbe0460a0a9317c3e71103
parent ec702b0afb6c8b921accc9f3498501f7e50aef06

qcacld-3.0: Make hif_opaque_softc as global HIF Context

Rename ol_softc to hif_opaque_softc.

Change-Id: I48f6e4b6eb04ccfa2050cca052e1ad67a66e3479
CRs-Fixed: 967765

core/dp/txrx/ol_tx.c

diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c
index 3346896..f63ee4d 100644
--- a/core/dp/txrx/ol_tx.c
+++ b/core/dp/txrx/ol_tx.c
@@ -694,8 +694,8 @@
 static inline cdf_nbuf_t
 ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
 {
-	struct ol_softc *hif_device =
-		(struct ol_softc *)cds_get_context(CDF_MODULE_ID_HIF);
+	struct hif_opaque_softc *hif_device =
+		(struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF);
 
 	if (cdf_likely(hif_device && hif_is_fastpath_mode_enabled(hif_device)))
 		msdu_list = ol_tx_ll_fast(vdev, msdu_list);

core/dp/txrx/ol_txrx.c

diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c
index 00bb205..be7623e 100644
--- a/core/dp/txrx/ol_txrx.c
+++ b/core/dp/txrx/ol_txrx.c
@@ -283,8 +283,8 @@
  *
  * Return: void
  */
-static inline void
-setup_fastpath_ce_handles(struct ol_softc *osc, struct ol_txrx_pdev_t *pdev)
+static inline void setup_fastpath_ce_handles(struct hif_opaque_softc *osc,
+						struct ol_txrx_pdev_t *pdev)
 {
 	/*
 	 * Before the HTT attach, set up the CE handles
@@ -296,8 +296,8 @@
 }
 
 #else  /* not WLAN_FEATURE_FASTPATH */
-static inline void
-setup_fastpath_ce_handles(struct ol_softc *osc, struct ol_txrx_pdev_t *pdev)
+static inline void setup_fastpath_ce_handles(struct hif_opaque_softc *osc,
+						struct ol_txrx_pdev_t *pdev)
 {
 }
 #endif /* WLAN_FEATURE_FASTPATH */
@@ -500,7 +500,7 @@
 	uint16_t fail_idx = 0;
 	int ret = 0;
 	uint16_t desc_pool_size;
-	struct ol_softc *osc =  cds_get_context(CDF_MODULE_ID_HIF);
+	struct hif_opaque_softc *osc =  cds_get_context(CDF_MODULE_ID_HIF);
 
 	uint16_t desc_element_size = sizeof(union ol_tx_desc_list_elem_t);
 	union ol_tx_desc_list_elem_t *c_element;
@@ -959,7 +959,7 @@
 void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force)
 {
 	int i;
-	struct ol_softc *osc =  cds_get_context(CDF_MODULE_ID_HIF);
+	struct hif_opaque_softc *osc =  cds_get_context(CDF_MODULE_ID_HIF);
 
 	/*checking to ensure txrx pdev structure is not NULL */
 	if (!pdev) {
@@ -3415,8 +3415,8 @@
  */
 void ol_register_lro_flush_cb(void (handler)(void *), void *data)
 {
-	struct ol_softc *hif_device =
-		(struct ol_softc *)cds_get_context(CDF_MODULE_ID_HIF);
+	struct hif_opaque_softc *hif_device =
+		(struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF);
 	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
 
 	pdev->lro_info.lro_flush_cb = handler;
@@ -3436,8 +3436,8 @@
  */
 void ol_deregister_lro_flush_cb(void)
 {
-	struct ol_softc *hif_device =
-		(struct ol_softc *)cds_get_context(CDF_MODULE_ID_HIF);
+	struct hif_opaque_softc *hif_device =
+		(struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF);
 	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
 
 	hif_lro_flush_cb_deregister(hif_device);