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/smc9194.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/smc9194.c')
-rw-r--r-- | drivers/net/smc9194.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c index 0a1b6f401087..934a12012829 100644 --- a/drivers/net/smc9194.c +++ b/drivers/net/smc9194.c | |||
@@ -299,7 +299,8 @@ static void smc_hardware_send_packet( struct net_device * dev ); | |||
299 | . to store the packet, I call this routine, which either sends it | 299 | . to store the packet, I call this routine, which either sends it |
300 | . now, or generates an interrupt when the card is ready for the | 300 | . now, or generates an interrupt when the card is ready for the |
301 | . packet */ | 301 | . packet */ |
302 | static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device *dev ); | 302 | static netdev_tx_t smc_wait_to_send_packet( struct sk_buff * skb, |
303 | struct net_device *dev ); | ||
303 | 304 | ||
304 | /* this does a soft reset on the device */ | 305 | /* this does a soft reset on the device */ |
305 | static void smc_reset( int ioaddr ); | 306 | static void smc_reset( int ioaddr ); |
@@ -487,7 +488,8 @@ static void smc_setmulticast( int ioaddr, int count, struct dev_mc_list * addrs | |||
487 | . o (NO): Enable interrupts and let the interrupt handler deal with it. | 488 | . o (NO): Enable interrupts and let the interrupt handler deal with it. |
488 | . o (YES):Send it now. | 489 | . o (YES):Send it now. |
489 | */ | 490 | */ |
490 | static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * dev ) | 491 | static netdev_tx_t smc_wait_to_send_packet(struct sk_buff *skb, |
492 | struct net_device *dev) | ||
491 | { | 493 | { |
492 | struct smc_local *lp = netdev_priv(dev); | 494 | struct smc_local *lp = netdev_priv(dev); |
493 | unsigned int ioaddr = dev->base_addr; | 495 | unsigned int ioaddr = dev->base_addr; |