aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorLuc Van Oostenryck <luc.vanoostenryck@gmail.com>2018-04-26 23:13:36 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2018-07-27 10:40:16 +0200
commit67c2eef22e2b5cdc45dad51bb36277362c04bccc (patch)
tree71c57a20156f710834252415c01df2c7bd4ada15 /drivers/net/can
parentcan: dev: enable multi-queue for SocketCAN devices (diff)
downloadlinux-dev-67c2eef22e2b5cdc45dad51bb36277362c04bccc.tar.xz
linux-dev-67c2eef22e2b5cdc45dad51bb36277362c04bccc.zip
can: janz-ican3: fix ican3_xmit()'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 <luc.vanoostenryck@gmail.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/janz-ican3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index adfdb66a486e..02042cb09bd2 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1684,7 +1684,7 @@ static int ican3_stop(struct net_device *ndev)
return 0;
}
-static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev)
+static netdev_tx_t ican3_xmit(struct sk_buff *skb, struct net_device *ndev)
{
struct ican3_dev *mod = netdev_priv(ndev);
struct can_frame *cf = (struct can_frame *)skb->data;