From 84e0d5f2a8a3126fb7c692ffbcd572c2a1640feb Mon Sep 17 00:00:00 2001 From: Yingying Tang Date: Wed, 22 Feb 2017 21:10:19 +0800 Subject: [PATCH] qcacld-3.0: Add "static" to fix compilation error for HL bus Add "static" before some functions which only be used in 1 file to resolve compilation error. Change-Id: Id1b1101c3bb04910ad1e3639887f74e44d5b7c36 CRs-Fixed: 2010227 --- core/dp/txrx/ol_tx.c | 2 +- core/dp/txrx/ol_tx_classify.c | 6 +++--- core/dp/txrx/ol_tx_sched.c | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 10a3d6d38f77..481110b8fee6 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -49,6 +49,7 @@ /* internal header files relevant only for specific systems (Pronto) */ #include /* OL_TX_ENCAP, etc */ #include +#include #ifdef WLAN_FEATURE_FASTPATH #include /* HIF_DEVICE */ @@ -56,7 +57,6 @@ #include #include /* htc_endpoint */ #include -#include #include int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t msdu, unsigned int transfer_id, uint32_t download_len); diff --git a/core/dp/txrx/ol_tx_classify.c b/core/dp/txrx/ol_tx_classify.c index eb4a87bba378..6094ac9a82b2 100644 --- a/core/dp/txrx/ol_tx_classify.c +++ b/core/dp/txrx/ol_tx_classify.c @@ -367,7 +367,7 @@ struct ol_txrx_peer_t *ol_tx_tdls_peer_find(struct ol_txrx_pdev_t *pdev, } #else -struct ol_txrx_peer_t *ol_tx_tdls_peer_find(struct ol_txrx_pdev_t *pdev, +static struct ol_txrx_peer_t *ol_tx_tdls_peer_find(struct ol_txrx_pdev_t *pdev, struct ol_txrx_vdev_t *vdev, uint8_t *peer_id) { @@ -734,7 +734,7 @@ ol_tx_classify_mgmt( return txq; } -A_STATUS +static A_STATUS ol_tx_classify_extension( struct ol_txrx_vdev_t *vdev, struct ol_tx_desc_t *tx_desc, @@ -845,7 +845,7 @@ ol_tx_classify_extension( return A_OK; } -A_STATUS +static A_STATUS ol_tx_classify_mgmt_extension( struct ol_txrx_vdev_t *vdev, struct ol_tx_desc_t *tx_desc, diff --git a/core/dp/txrx/ol_tx_sched.c b/core/dp/txrx/ol_tx_sched.c index 470bf28361a4..0df4d8e2fc42 100644 --- a/core/dp/txrx/ol_tx_sched.c +++ b/core/dp/txrx/ol_tx_sched.c @@ -936,7 +936,7 @@ ol_tx_sched_txq_deactivate_wrr_adv( category->state.active = 0; } -ol_tx_frms_queue_list * +static ol_tx_frms_queue_list * ol_tx_sched_category_tx_queues_wrr_adv(struct ol_txrx_pdev_t *pdev, int cat) { struct ol_tx_sched_wrr_adv_t *scheduler = pdev->tx_sched.scheduler; @@ -946,7 +946,7 @@ ol_tx_sched_category_tx_queues_wrr_adv(struct ol_txrx_pdev_t *pdev, int cat) return &category->state.head; } -int +static int ol_tx_sched_discard_select_category_wrr_adv(struct ol_txrx_pdev_t *pdev) { struct ol_tx_sched_wrr_adv_t *scheduler; @@ -974,7 +974,7 @@ ol_tx_sched_discard_select_category_wrr_adv(struct ol_txrx_pdev_t *pdev) return cat; } -void +static void ol_tx_sched_txq_discard_wrr_adv( struct ol_txrx_pdev_t *pdev, struct ol_tx_frms_queue_t *txq, @@ -996,7 +996,7 @@ ol_tx_sched_txq_discard_wrr_adv( category->state.active = 0; } -void +static void ol_tx_sched_category_info_wrr_adv( struct ol_txrx_pdev_t *pdev, int cat, int *active, @@ -1077,7 +1077,7 @@ void ol_tx_sched_wrr_param_update(struct ol_txrx_pdev_t *pdev, } } -void * +static void * ol_tx_sched_init_wrr_adv( struct ol_txrx_pdev_t *pdev) { @@ -1228,7 +1228,7 @@ void ol_tx_sched_stats_clear(struct ol_txrx_pdev_t *pdev) /*--- congestion control discard --------------------------------------------*/ -struct ol_tx_frms_queue_t * +static struct ol_tx_frms_queue_t * ol_tx_sched_discard_select_txq( struct ol_txrx_pdev_t *pdev, ol_tx_frms_queue_list *tx_queues) @@ -1370,7 +1370,7 @@ ol_tx_sched_notify( #define OL_TX_MSDU_ID_STORAGE_ERR(ptr) (NULL == ptr) -void +static void ol_tx_sched_dispatch( struct ol_txrx_pdev_t *pdev, struct ol_tx_sched_ctx *sctx)