From: Luc Van Oostenryck Date: Sun, 28 Jun 2020 19:53:30 +0000 (+0200) Subject: net: nfp: fix nfp_net_tx()'s return type X-Git-Tag: v5.9-rc1~133^2~402^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=737ce1e98668cda4fd2ff64ac4132511a3b09f64;p=thirdparty%2Fkernel%2Flinux.git net: nfp: fix nfp_net_tx()'s return type The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, but the implementation in this driver returns an 'int'. Fix this by returning 'netdev_tx_t' in this driver too. Signed-off-by: Luc Van Oostenryck Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 0e0cc3d58bdc9..83ff18140bfe8 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -974,7 +974,7 @@ static int nfp_net_prep_tx_meta(struct sk_buff *skb, u64 tls_handle) * * Return: NETDEV_TX_OK on success. */ -static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) { struct nfp_net *nn = netdev_priv(netdev); const skb_frag_t *frag;