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/ariadne.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/ariadne.c')
-rw-r--r-- | drivers/net/ariadne.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c index 47d976cc3d7d..c35af3e106b1 100644 --- a/drivers/net/ariadne.c +++ b/drivers/net/ariadne.c | |||
@@ -115,7 +115,8 @@ struct lancedata { | |||
115 | 115 | ||
116 | static int ariadne_open(struct net_device *dev); | 116 | static int ariadne_open(struct net_device *dev); |
117 | static void ariadne_init_ring(struct net_device *dev); | 117 | static void ariadne_init_ring(struct net_device *dev); |
118 | static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev); | 118 | static netdev_tx_t ariadne_start_xmit(struct sk_buff *skb, |
119 | struct net_device *dev); | ||
119 | static void ariadne_tx_timeout(struct net_device *dev); | 120 | static void ariadne_tx_timeout(struct net_device *dev); |
120 | static int ariadne_rx(struct net_device *dev); | 121 | static int ariadne_rx(struct net_device *dev); |
121 | static void ariadne_reset(struct net_device *dev); | 122 | static void ariadne_reset(struct net_device *dev); |
@@ -589,7 +590,8 @@ static void ariadne_tx_timeout(struct net_device *dev) | |||
589 | } | 590 | } |
590 | 591 | ||
591 | 592 | ||
592 | static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev) | 593 | static netdev_tx_t ariadne_start_xmit(struct sk_buff *skb, |
594 | struct net_device *dev) | ||
593 | { | 595 | { |
594 | struct ariadne_private *priv = netdev_priv(dev); | 596 | struct ariadne_private *priv = netdev_priv(dev); |
595 | volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr; | 597 | volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr; |