Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cail,hsi: fix cfhsi_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 and
returning NETDEV_TX_OK instead of 0 accordingly.

Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Luc Van Oostenryck and committed by
David S. Miller
c6ecd475 fe80536a

+3 -3
+3 -3
drivers/net/caif/caif_hsi.c
··· 1006 1006 cfhsi_start_tx(cfhsi); 1007 1007 } 1008 1008 1009 - static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) 1009 + static netdev_tx_t cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) 1010 1010 { 1011 1011 struct cfhsi *cfhsi = NULL; 1012 1012 int start_xfer = 0; ··· 1072 1072 spin_unlock_bh(&cfhsi->lock); 1073 1073 if (aggregate_ready) 1074 1074 cfhsi_start_tx(cfhsi); 1075 - return 0; 1075 + return NETDEV_TX_OK; 1076 1076 } 1077 1077 1078 1078 /* Delete inactivity timer if started. */ ··· 1102 1102 queue_work(cfhsi->wq, &cfhsi->wake_up_work); 1103 1103 } 1104 1104 1105 - return 0; 1105 + return NETDEV_TX_OK; 1106 1106 } 1107 1107 1108 1108 static const struct net_device_ops cfhsi_netdevops;