From 24018994a5e2104e4f34aea54842f02b4c2bad97 Mon Sep 17 00:00:00 2001 From: Vevek Venkatesan Date: Tue, 28 May 2019 18:19:15 +0530 Subject: [PATCH] qcacld-3.0: abstract Linux identifiers from IPA component Abstract Linux based OS identifiers from IPA component in HDD/OSIF layer. Change-Id: I82a5db8c796d47d552757b1a450df10c72061177 --- ipa/core/inc/wlan_ipa_core.h | 3 ++- ipa/core/inc/wlan_ipa_main.h | 4 +++- ipa/core/inc/wlan_ipa_priv.h | 2 +- ipa/core/src/wlan_ipa_main.c | 3 ++- ipa/dispatcher/inc/wlan_ipa_ucfg_api.h | 6 ++++-- ipa/dispatcher/src/wlan_ipa_ucfg_api.c | 3 ++- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ipa/core/inc/wlan_ipa_core.h b/ipa/core/inc/wlan_ipa_core.h index d4c17d85ad..03c41ef561 100644 --- a/ipa/core/inc/wlan_ipa_core.h +++ b/ipa/core/inc/wlan_ipa_core.h @@ -492,7 +492,8 @@ void wlan_ipa_reg_sap_xmit_cb(struct wlan_ipa_priv *ipa_ctx, * Return: None */ static inline -void wlan_ipa_reg_send_to_nw_cb(struct wlan_ipa_priv *ipa_ctx, void *cb) +void wlan_ipa_reg_send_to_nw_cb(struct wlan_ipa_priv *ipa_ctx, + wlan_ipa_send_to_nw cb) { ipa_ctx->send_to_nw = cb; } diff --git a/ipa/core/inc/wlan_ipa_main.h b/ipa/core/inc/wlan_ipa_main.h index 2d586fe157..c5df48650a 100644 --- a/ipa/core/inc/wlan_ipa_main.h +++ b/ipa/core/inc/wlan_ipa_main.h @@ -253,7 +253,8 @@ void ipa_reg_sap_xmit_cb(struct wlan_objmgr_pdev *pdev, * * Return: None */ -void ipa_reg_send_to_nw_cb(struct wlan_objmgr_pdev *pdev, void *cb); +void ipa_reg_send_to_nw_cb(struct wlan_objmgr_pdev *pdev, + wlan_ipa_send_to_nw cb); /** * ipa_set_mcc_mode() - Set MCC mode @@ -433,6 +434,7 @@ uint32_t ipa_get_tx_buf_count(void); #else /* Not IPA_OFFLOAD */ typedef QDF_STATUS (*wlan_ipa_softap_xmit)(qdf_nbuf_t nbuf, qdf_netdev_t dev); +typedef void (*wlan_ipa_send_to_nw)(qdf_nbuf_t nbuf, qdf_netdev_t dev); #endif /* IPA_OFFLOAD */ #endif /* end of _WLAN_IPA_MAIN_H_ */ diff --git a/ipa/core/inc/wlan_ipa_priv.h b/ipa/core/inc/wlan_ipa_priv.h index c8c8cee7d4..9fa8201cd4 100644 --- a/ipa/core/inc/wlan_ipa_priv.h +++ b/ipa/core/inc/wlan_ipa_priv.h @@ -567,7 +567,7 @@ struct wlan_ipa_tx_desc { }; typedef QDF_STATUS (*wlan_ipa_softap_xmit)(qdf_nbuf_t nbuf, qdf_netdev_t dev); -typedef void (*wlan_ipa_send_to_nw)(qdf_nbuf_t skb, qdf_netdev_t dev); +typedef void (*wlan_ipa_send_to_nw)(qdf_nbuf_t nbuf, qdf_netdev_t dev); /* IPA private context structure definition */ struct wlan_ipa_priv { diff --git a/ipa/core/src/wlan_ipa_main.c b/ipa/core/src/wlan_ipa_main.c index 72f7ebff35..a9187af21a 100644 --- a/ipa/core/src/wlan_ipa_main.c +++ b/ipa/core/src/wlan_ipa_main.c @@ -300,7 +300,8 @@ void ipa_reg_sap_xmit_cb(struct wlan_objmgr_pdev *pdev, wlan_ipa_softap_xmit cb) return wlan_ipa_reg_sap_xmit_cb(ipa_obj, cb); } -void ipa_reg_send_to_nw_cb(struct wlan_objmgr_pdev *pdev, void *cb) +void ipa_reg_send_to_nw_cb(struct wlan_objmgr_pdev *pdev, + wlan_ipa_send_to_nw cb) { struct wlan_ipa_priv *ipa_obj; diff --git a/ipa/dispatcher/inc/wlan_ipa_ucfg_api.h b/ipa/dispatcher/inc/wlan_ipa_ucfg_api.h index ea425b3a00..7b4b423fb3 100644 --- a/ipa/dispatcher/inc/wlan_ipa_ucfg_api.h +++ b/ipa/dispatcher/inc/wlan_ipa_ucfg_api.h @@ -161,7 +161,8 @@ void ucfg_ipa_reg_sap_xmit_cb(struct wlan_objmgr_pdev *pdev, * * Return: None */ -void ucfg_ipa_reg_send_to_nw_cb(struct wlan_objmgr_pdev *pdev, void *cb); +void ucfg_ipa_reg_send_to_nw_cb(struct wlan_objmgr_pdev *pdev, + wlan_ipa_send_to_nw cb); /** * ucfg_ipa_set_mcc_mode() - Set MCC mode @@ -423,7 +424,8 @@ void ucfg_ipa_reg_sap_xmit_cb(struct wlan_objmgr_pdev *pdev, } static inline -void ucfg_ipa_reg_send_to_nw_cb(struct wlan_objmgr_pdev *pdev, void *cb) +void ucfg_ipa_reg_send_to_nw_cb(struct wlan_objmgr_pdev *pdev, + wlan_ipa_send_to_nw cb) { } diff --git a/ipa/dispatcher/src/wlan_ipa_ucfg_api.c b/ipa/dispatcher/src/wlan_ipa_ucfg_api.c index a6478b3073..53fe6f6275 100644 --- a/ipa/dispatcher/src/wlan_ipa_ucfg_api.c +++ b/ipa/dispatcher/src/wlan_ipa_ucfg_api.c @@ -95,7 +95,8 @@ void ucfg_ipa_reg_sap_xmit_cb(struct wlan_objmgr_pdev *pdev, return ipa_reg_sap_xmit_cb(pdev, cb); } -void ucfg_ipa_reg_send_to_nw_cb(struct wlan_objmgr_pdev *pdev, void *cb) +void ucfg_ipa_reg_send_to_nw_cb(struct wlan_objmgr_pdev *pdev, + wlan_ipa_send_to_nw cb) { return ipa_reg_send_to_nw_cb(pdev, cb);