From 964cd0e528e7a4d5dd90afb0ca19c714ea60d1f1 Mon Sep 17 00:00:00 2001 From: nakul kachhwaha Date: Tue, 14 Jan 2020 11:04:21 +0530 Subject: [PATCH] qcacld-3.0: Fix compilation issue on kernel v4.19 Removed ol_tx_hl_vdev_bundle_timer definition for kernel v4.15 as __os_timer_shim will wrap the kernel timer handler API prototype as per new definition for kernel v4.15 and above. Change-Id: I873ba706050ea8020e4af7133c86ef8aabb93d53 CRs-Fixed: 2602835 --- core/dp/txrx/ol_tx_hl.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/core/dp/txrx/ol_tx_hl.c b/core/dp/txrx/ol_tx_hl.c index 4a7064984510..ed0f29f09c39 100644 --- a/core/dp/txrx/ol_tx_hl.c +++ b/core/dp/txrx/ol_tx_hl.c @@ -1622,19 +1622,6 @@ ol_tx_hl_pdev_queue_send_all(struct ol_txrx_pdev_t *pdev) * * Return: none */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) -void -ol_tx_hl_vdev_bundle_timer(struct timer_list *t) -{ - qdf_nbuf_t msdu_list; - struct ol_txrx_vdev_t *vdev = from_timer(vdev, t, bundle_queue.timer); - - vdev->no_of_bundle_sent_in_timer++; - msdu_list = ol_tx_hl_vdev_queue_send_all(vdev, true, true); - if (msdu_list) - qdf_nbuf_tx_free(msdu_list, 1/*error*/); -} -#else void ol_tx_hl_vdev_bundle_timer(void *ctx) { @@ -1646,7 +1633,6 @@ ol_tx_hl_vdev_bundle_timer(void *ctx) if (msdu_list) qdf_nbuf_tx_free(msdu_list, 1/*error*/); } -#endif qdf_nbuf_t ol_tx_hl(struct ol_txrx_vdev_t *vdev, qdf_nbuf_t msdu_list)