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/dl2k.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/dl2k.c')
-rw-r--r-- | drivers/net/dl2k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index 4b6a219fecea..7fa7a907f134 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c | |||
@@ -59,7 +59,7 @@ static int rio_open (struct net_device *dev); | |||
59 | static void rio_timer (unsigned long data); | 59 | static void rio_timer (unsigned long data); |
60 | static void rio_tx_timeout (struct net_device *dev); | 60 | static void rio_tx_timeout (struct net_device *dev); |
61 | static void alloc_list (struct net_device *dev); | 61 | static void alloc_list (struct net_device *dev); |
62 | static int start_xmit (struct sk_buff *skb, struct net_device *dev); | 62 | static netdev_tx_t start_xmit (struct sk_buff *skb, struct net_device *dev); |
63 | static irqreturn_t rio_interrupt (int irq, void *dev_instance); | 63 | static irqreturn_t rio_interrupt (int irq, void *dev_instance); |
64 | static void rio_free_tx (struct net_device *dev, int irq); | 64 | static void rio_free_tx (struct net_device *dev, int irq); |
65 | static void tx_error (struct net_device *dev, int tx_status); | 65 | static void tx_error (struct net_device *dev, int tx_status); |
@@ -600,7 +600,7 @@ alloc_list (struct net_device *dev) | |||
600 | return; | 600 | return; |
601 | } | 601 | } |
602 | 602 | ||
603 | static int | 603 | static netdev_tx_t |
604 | start_xmit (struct sk_buff *skb, struct net_device *dev) | 604 | start_xmit (struct sk_buff *skb, struct net_device *dev) |
605 | { | 605 | { |
606 | struct netdev_private *np = netdev_priv(dev); | 606 | struct netdev_private *np = netdev_priv(dev); |