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/pcnet32.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/pcnet32.c')
-rw-r--r-- | drivers/net/pcnet32.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 6859442f1862..6d28b18e7e28 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -303,7 +303,8 @@ static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *); | |||
303 | static int pcnet32_probe1(unsigned long, int, struct pci_dev *); | 303 | static int pcnet32_probe1(unsigned long, int, struct pci_dev *); |
304 | static int pcnet32_open(struct net_device *); | 304 | static int pcnet32_open(struct net_device *); |
305 | static int pcnet32_init_ring(struct net_device *); | 305 | static int pcnet32_init_ring(struct net_device *); |
306 | static int pcnet32_start_xmit(struct sk_buff *, struct net_device *); | 306 | static netdev_tx_t pcnet32_start_xmit(struct sk_buff *, |
307 | struct net_device *); | ||
307 | static void pcnet32_tx_timeout(struct net_device *dev); | 308 | static void pcnet32_tx_timeout(struct net_device *dev); |
308 | static irqreturn_t pcnet32_interrupt(int, void *); | 309 | static irqreturn_t pcnet32_interrupt(int, void *); |
309 | static int pcnet32_close(struct net_device *); | 310 | static int pcnet32_close(struct net_device *); |
@@ -2481,7 +2482,8 @@ static void pcnet32_tx_timeout(struct net_device *dev) | |||
2481 | spin_unlock_irqrestore(&lp->lock, flags); | 2482 | spin_unlock_irqrestore(&lp->lock, flags); |
2482 | } | 2483 | } |
2483 | 2484 | ||
2484 | static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev) | 2485 | static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb, |
2486 | struct net_device *dev) | ||
2485 | { | 2487 | { |
2486 | struct pcnet32_private *lp = netdev_priv(dev); | 2488 | struct pcnet32_private *lp = netdev_priv(dev); |
2487 | unsigned long ioaddr = dev->base_addr; | 2489 | unsigned long ioaddr = dev->base_addr; |