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/lance.c | |
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/lance.c')
-rw-r--r-- | drivers/net/lance.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index 30fd4f5f1d5a..dcda30338b65 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
@@ -300,7 +300,8 @@ static unsigned char lance_need_isa_bounce_buffers = 1; | |||
300 | 300 | ||
301 | static int lance_open(struct net_device *dev); | 301 | static int lance_open(struct net_device *dev); |
302 | static void lance_init_ring(struct net_device *dev, gfp_t mode); | 302 | static void lance_init_ring(struct net_device *dev, gfp_t mode); |
303 | static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev); | 303 | static netdev_tx_t lance_start_xmit(struct sk_buff *skb, |
304 | struct net_device *dev); | ||
304 | static int lance_rx(struct net_device *dev); | 305 | static int lance_rx(struct net_device *dev); |
305 | static irqreturn_t lance_interrupt(int irq, void *dev_id); | 306 | static irqreturn_t lance_interrupt(int irq, void *dev_id); |
306 | static int lance_close(struct net_device *dev); | 307 | static int lance_close(struct net_device *dev); |
@@ -949,7 +950,8 @@ static void lance_tx_timeout (struct net_device *dev) | |||
949 | } | 950 | } |
950 | 951 | ||
951 | 952 | ||
952 | static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | 953 | static netdev_tx_t lance_start_xmit(struct sk_buff *skb, |
954 | struct net_device *dev) | ||
953 | { | 955 | { |
954 | struct lance_private *lp = dev->ml_priv; | 956 | struct lance_private *lp = dev->ml_priv; |
955 | int ioaddr = dev->base_addr; | 957 | int ioaddr = dev->base_addr; |