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/eexpress.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/eexpress.c')
-rw-r--r-- | drivers/net/eexpress.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index d1b6368faacd..592de8f1668a 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c | |||
@@ -246,7 +246,8 @@ static char mca_irqmap[] = { 12, 9, 3, 4, 5, 10, 11, 15 }; | |||
246 | static int eexp_open(struct net_device *dev); | 246 | static int eexp_open(struct net_device *dev); |
247 | static int eexp_close(struct net_device *dev); | 247 | static int eexp_close(struct net_device *dev); |
248 | static void eexp_timeout(struct net_device *dev); | 248 | static void eexp_timeout(struct net_device *dev); |
249 | static int eexp_xmit(struct sk_buff *buf, struct net_device *dev); | 249 | static netdev_tx_t eexp_xmit(struct sk_buff *buf, |
250 | struct net_device *dev); | ||
250 | 251 | ||
251 | static irqreturn_t eexp_irq(int irq, void *dev_addr); | 252 | static irqreturn_t eexp_irq(int irq, void *dev_addr); |
252 | static void eexp_set_multicast(struct net_device *dev); | 253 | static void eexp_set_multicast(struct net_device *dev); |
@@ -650,7 +651,7 @@ static void eexp_timeout(struct net_device *dev) | |||
650 | * Called to transmit a packet, or to allow us to right ourselves | 651 | * Called to transmit a packet, or to allow us to right ourselves |
651 | * if the kernel thinks we've died. | 652 | * if the kernel thinks we've died. |
652 | */ | 653 | */ |
653 | static int eexp_xmit(struct sk_buff *buf, struct net_device *dev) | 654 | static netdev_tx_t eexp_xmit(struct sk_buff *buf, struct net_device *dev) |
654 | { | 655 | { |
655 | short length = buf->len; | 656 | short length = buf->len; |
656 | #ifdef CONFIG_SMP | 657 | #ifdef CONFIG_SMP |