From cc42e4e3f1014f2d24437955bc1e90b77cef343e Mon Sep 17 00:00:00 2001 From: Martin Habets Date: Mon, 11 Apr 2022 12:27:15 +0100 Subject: [PATCH] sfc: Remove duplicate definition of efx_xmit_done It is defined both in efx.h and tx_common.h. Remove the definition in efx.h. Signed-off-by: Martin Habets Signed-off-by: Paolo Abeni --- drivers/net/ethernet/sfc/efx.h | 1 - drivers/net/ethernet/sfc/farch.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h index daf0c00c12424..c05a83da9e44d 100644 --- a/drivers/net/ethernet/sfc/efx.h +++ b/drivers/net/ethernet/sfc/efx.h @@ -28,7 +28,6 @@ static inline netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct ef100_enqueue_skb, __efx_enqueue_skb, tx_queue, skb); } -void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index); void efx_xmit_done_single(struct efx_tx_queue *tx_queue); int efx_setup_tc(struct net_device *net_dev, enum tc_setup_type type, void *type_data); diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c index 148dcd48b58d3..9599123bc28df 100644 --- a/drivers/net/ethernet/sfc/farch.c +++ b/drivers/net/ethernet/sfc/farch.c @@ -16,6 +16,7 @@ #include "bitfield.h" #include "efx.h" #include "rx_common.h" +#include "tx_common.h" #include "nic.h" #include "farch_regs.h" #include "sriov.h" -- 2.30.2