diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:14:07 -0400 |
commit | 61357325f377889a1daffa14962d705dc814dd0e (patch) | |
tree | 7b436f1097abbc5681de6d1e5901f62963b42220 /drivers/net/can | |
parent | d0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (diff) |
netdev: convert bulk of drivers to netdev_tx_t
In a couple of cases collapse some extra code like:
int retval = NETDEV_TX_OK;
...
return retval;
into
return NETDEV_TX_OK;
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can')
-rw-r--r-- | drivers/net/can/sja1000/sja1000.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index b3004de1e5e4..9ce3ddac4e9b 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c | |||
@@ -238,7 +238,8 @@ static void chipset_init(struct net_device *dev) | |||
238 | * xx xx xx xx ff ll 00 11 22 33 44 55 66 77 | 238 | * xx xx xx xx ff ll 00 11 22 33 44 55 66 77 |
239 | * [ can-id ] [flags] [len] [can data (up to 8 bytes] | 239 | * [ can-id ] [flags] [len] [can data (up to 8 bytes] |
240 | */ | 240 | */ |
241 | static int sja1000_start_xmit(struct sk_buff *skb, struct net_device *dev) | 241 | static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb, |
242 | struct net_device *dev) | ||
242 | { | 243 | { |
243 | struct sja1000_priv *priv = netdev_priv(dev); | 244 | struct sja1000_priv *priv = netdev_priv(dev); |
244 | struct net_device_stats *stats = &dev->stats; | 245 | struct net_device_stats *stats = &dev->stats; |