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/yellowfin.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/yellowfin.c')
-rw-r--r-- | drivers/net/yellowfin.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 76764237cde6..9509477f61f4 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
@@ -347,7 +347,8 @@ static int yellowfin_open(struct net_device *dev); | |||
347 | static void yellowfin_timer(unsigned long data); | 347 | static void yellowfin_timer(unsigned long data); |
348 | static void yellowfin_tx_timeout(struct net_device *dev); | 348 | static void yellowfin_tx_timeout(struct net_device *dev); |
349 | static void yellowfin_init_ring(struct net_device *dev); | 349 | static void yellowfin_init_ring(struct net_device *dev); |
350 | static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev); | 350 | static netdev_tx_t yellowfin_start_xmit(struct sk_buff *skb, |
351 | struct net_device *dev); | ||
351 | static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance); | 352 | static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance); |
352 | static int yellowfin_rx(struct net_device *dev); | 353 | static int yellowfin_rx(struct net_device *dev); |
353 | static void yellowfin_error(struct net_device *dev, int intr_status); | 354 | static void yellowfin_error(struct net_device *dev, int intr_status); |
@@ -808,7 +809,8 @@ static void yellowfin_init_ring(struct net_device *dev) | |||
808 | return; | 809 | return; |
809 | } | 810 | } |
810 | 811 | ||
811 | static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev) | 812 | static netdev_tx_t yellowfin_start_xmit(struct sk_buff *skb, |
813 | struct net_device *dev) | ||
812 | { | 814 | { |
813 | struct yellowfin_private *yp = netdev_priv(dev); | 815 | struct yellowfin_private *yp = netdev_priv(dev); |
814 | unsigned entry; | 816 | unsigned entry; |