From: YueHaibing Date: Wed, 26 Sep 2018 10:32:29 +0000 (+0800) Subject: can: xilinx: fix return type of ndo_start_xmit function X-Git-Tag: v4.19.89~123 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a57b3ecc06d4dbc3b327a98a6ce5e432112e1f95;p=thirdparty%2Fkernel%2Fstable.git can: xilinx: fix return type of ndo_start_xmit function [ Upstream commit 81de0cd60fd492575b24d97667f38b8b833fb058 ] The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t. Found by coccinelle. Signed-off-by: YueHaibing Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c index 3df23487487f7..b01c6da4dd814 100644 --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c @@ -612,7 +612,7 @@ static int xcan_start_xmit_mailbox(struct sk_buff *skb, struct net_device *ndev) * * Return: NETDEV_TX_OK on success and NETDEV_TX_BUSY when the tx queue is full */ -static int xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev) { struct xcan_priv *priv = netdev_priv(ndev); int ret;