From 23a8eecd28e1a062b8830688bc4c1c9ccc1da379 Mon Sep 17 00:00:00 2001 From: Yuanyuan Liu Date: Fri, 15 Dec 2017 16:01:12 -0800 Subject: [PATCH] qcacld-3.0: remove struct sps_iovc reference Since struct sps_iovc is obsolete in the latest kernel, use a local macro instead of sizeof() . It should be updated with the correct IPA size macro once it is avaiable in the latest kernel. CRs-Fixed: 2160658 Change-Id: Ifc2926d5182c96e07de6b4ddd50156764b7ad51e --- core/dp/txrx/ol_txrx_ipa.c | 2 +- core/dp/txrx/ol_txrx_types.h | 2 ++ core/hdd/src/wlan_hdd_ipa.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/dp/txrx/ol_txrx_ipa.c b/core/dp/txrx/ol_txrx_ipa.c index 56543ab70873..2565fcaa6b70 100644 --- a/core/dp/txrx/ol_txrx_ipa.c +++ b/core/dp/txrx/ol_txrx_ipa.c @@ -386,7 +386,7 @@ QDF_STATUS ol_txrx_ipa_setup(struct cdp_pdev *ppdev, void *ipa_i2w_cb, QDF_IPA_PIPE_IN_MODE(&pipe_in) = IPA_BASIC; QDF_IPA_PIPE_IN_CLIENT(&pipe_in) = IPA_CLIENT_WLAN1_PROD; QDF_IPA_PIPE_IN_DESC_FIFO_SZ(&pipe_in) = - ipa_desc_size + sizeof(struct sps_iovec); + ipa_desc_size + SPS_DESC_SIZE; QDF_IPA_PIPE_IN_NOTIFY(&pipe_in) = ipa_w2i_cb; if (!is_rm_enabled) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index e5c9064d3cbc..b07a5eabd90e 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -1325,4 +1325,6 @@ struct ol_rx_remote_data { #define INVALID_REORDER_INDEX 0xFFFF +#define SPS_DESC_SIZE 8 + #endif /* _OL_TXRX_TYPES__H_ */ diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 912e8260c7f4..4f63080fe095 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -4992,7 +4992,7 @@ static int hdd_ipa_setup_sys_pipe(struct hdd_ipa_priv *hdd_ipa) * make sure hardware always has one descriptor. */ desc_fifo_sz = hdd_ipa->hdd_ctx->config->IpaDescSize - + sizeof(struct sps_iovec); + + SPS_DESC_SIZE; ret = hdd_ipa_setup_tx_sys_pipe(hdd_ipa, desc_fifo_sz); if (ret) {