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/starfire.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/starfire.c')
-rw-r--r-- | drivers/net/starfire.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index 5e7645ee8ab0..a36e2b51e88c 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
@@ -595,7 +595,7 @@ static int netdev_open(struct net_device *dev); | |||
595 | static void check_duplex(struct net_device *dev); | 595 | static void check_duplex(struct net_device *dev); |
596 | static void tx_timeout(struct net_device *dev); | 596 | static void tx_timeout(struct net_device *dev); |
597 | static void init_ring(struct net_device *dev); | 597 | static void init_ring(struct net_device *dev); |
598 | static int start_tx(struct sk_buff *skb, struct net_device *dev); | 598 | static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev); |
599 | static irqreturn_t intr_handler(int irq, void *dev_instance); | 599 | static irqreturn_t intr_handler(int irq, void *dev_instance); |
600 | static void netdev_error(struct net_device *dev, int intr_status); | 600 | static void netdev_error(struct net_device *dev, int intr_status); |
601 | static int __netdev_rx(struct net_device *dev, int *quota); | 601 | static int __netdev_rx(struct net_device *dev, int *quota); |
@@ -1223,7 +1223,7 @@ static void init_ring(struct net_device *dev) | |||
1223 | } | 1223 | } |
1224 | 1224 | ||
1225 | 1225 | ||
1226 | static int start_tx(struct sk_buff *skb, struct net_device *dev) | 1226 | static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev) |
1227 | { | 1227 | { |
1228 | struct netdev_private *np = netdev_priv(dev); | 1228 | struct netdev_private *np = netdev_priv(dev); |
1229 | unsigned int entry; | 1229 | unsigned int entry; |