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/eth16i.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/eth16i.c')
-rw-r--r-- | drivers/net/eth16i.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index 97d5205edc8f..71bfeec33a0b 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c | |||
@@ -405,7 +405,7 @@ static int eth16i_read_eeprom_word(int ioaddr); | |||
405 | static void eth16i_eeprom_cmd(int ioaddr, unsigned char command); | 405 | static void eth16i_eeprom_cmd(int ioaddr, unsigned char command); |
406 | static int eth16i_open(struct net_device *dev); | 406 | static int eth16i_open(struct net_device *dev); |
407 | static int eth16i_close(struct net_device *dev); | 407 | static int eth16i_close(struct net_device *dev); |
408 | static int eth16i_tx(struct sk_buff *skb, struct net_device *dev); | 408 | static netdev_tx_t eth16i_tx(struct sk_buff *skb, struct net_device *dev); |
409 | static void eth16i_rx(struct net_device *dev); | 409 | static void eth16i_rx(struct net_device *dev); |
410 | static void eth16i_timeout(struct net_device *dev); | 410 | static void eth16i_timeout(struct net_device *dev); |
411 | static irqreturn_t eth16i_interrupt(int irq, void *dev_id); | 411 | static irqreturn_t eth16i_interrupt(int irq, void *dev_id); |
@@ -1053,7 +1053,7 @@ static void eth16i_timeout(struct net_device *dev) | |||
1053 | netif_wake_queue(dev); | 1053 | netif_wake_queue(dev); |
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | static int eth16i_tx(struct sk_buff *skb, struct net_device *dev) | 1056 | static netdev_tx_t eth16i_tx(struct sk_buff *skb, struct net_device *dev) |
1057 | { | 1057 | { |
1058 | struct eth16i_local *lp = netdev_priv(dev); | 1058 | struct eth16i_local *lp = netdev_priv(dev); |
1059 | int ioaddr = dev->base_addr; | 1059 | int ioaddr = dev->base_addr; |