]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
can: xilinx: fix return type of ndo_start_xmit function
authorYueHaibing <yuehaibing@huawei.com>
Wed, 26 Sep 2018 10:32:29 +0000 (18:32 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Dec 2019 07:52:08 +0000 (08:52 +0100)
[ 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 <yuehaibing@huawei.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/can/xilinx_can.c

index 3df23487487f7821a0cf545d3d0a97aba1f149d5..b01c6da4dd814595b46eaad8e024537efc19f14e 100644 (file)
@@ -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;