diff options
| author |   Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2018-04-26 23:13:38 +0200 |
|---|---|---|
| committer |   Marc Kleine-Budde <mkl@pengutronix.de> | 2018-07-27 10:40:16 +0200 |
| commit | 97f2a5893ca539bfc308c8abf0a36d678305c854 (patch) | |
| tree | 2bc95102a055f274dd60f0d0b63aa28d5c2f6d66 /drivers/net/can | |
| parent | can: sun4i: fix sun4ican_start_xmit()'s return type (diff) | |
| download | linux-dev-97f2a5893ca539bfc308c8abf0a36d678305c854.tar.xz linux-dev-97f2a5893ca539bfc308c8abf0a36d678305c854.zip | |
can: xilinx: fix xcan_start_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>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/xilinx_can.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c index 5a24039733ef..545f69476866 100644 --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c @@ -398,9 +398,9 @@ static int xcan_do_set_mode(struct net_device *ndev, enum can_mode mode) * function uses the next available free txbuff and populates their fields to * start the transmission. * - * Return: 0 on success and failure value on error + * 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); struct net_device_stats *stats = &ndev->stats; |