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/natsemi.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/natsemi.c')
-rw-r--r-- | drivers/net/natsemi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 32db12a27342..bd41351e4e26 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -621,7 +621,7 @@ static void drain_ring(struct net_device *dev); | |||
621 | static void free_ring(struct net_device *dev); | 621 | static void free_ring(struct net_device *dev); |
622 | static void reinit_ring(struct net_device *dev); | 622 | static void reinit_ring(struct net_device *dev); |
623 | static void init_registers(struct net_device *dev); | 623 | static void init_registers(struct net_device *dev); |
624 | static int start_tx(struct sk_buff *skb, struct net_device *dev); | 624 | static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev); |
625 | static irqreturn_t intr_handler(int irq, void *dev_instance); | 625 | static irqreturn_t intr_handler(int irq, void *dev_instance); |
626 | static void netdev_error(struct net_device *dev, int intr_status); | 626 | static void netdev_error(struct net_device *dev, int intr_status); |
627 | static int natsemi_poll(struct napi_struct *napi, int budget); | 627 | static int natsemi_poll(struct napi_struct *napi, int budget); |
@@ -2079,7 +2079,7 @@ static void reinit_ring(struct net_device *dev) | |||
2079 | reinit_rx(dev); | 2079 | reinit_rx(dev); |
2080 | } | 2080 | } |
2081 | 2081 | ||
2082 | static int start_tx(struct sk_buff *skb, struct net_device *dev) | 2082 | static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev) |
2083 | { | 2083 | { |
2084 | struct netdev_private *np = netdev_priv(dev); | 2084 | struct netdev_private *np = netdev_priv(dev); |
2085 | void __iomem * ioaddr = ns_ioaddr(dev); | 2085 | void __iomem * ioaddr = ns_ioaddr(dev); |