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/eepro.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/eepro.c')
-rw-r--r-- | drivers/net/eepro.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 53317a83857a..1e934160062c 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
@@ -309,7 +309,8 @@ struct eepro_local { | |||
309 | 309 | ||
310 | static int eepro_probe1(struct net_device *dev, int autoprobe); | 310 | static int eepro_probe1(struct net_device *dev, int autoprobe); |
311 | static int eepro_open(struct net_device *dev); | 311 | static int eepro_open(struct net_device *dev); |
312 | static int eepro_send_packet(struct sk_buff *skb, struct net_device *dev); | 312 | static netdev_tx_t eepro_send_packet(struct sk_buff *skb, |
313 | struct net_device *dev); | ||
313 | static irqreturn_t eepro_interrupt(int irq, void *dev_id); | 314 | static irqreturn_t eepro_interrupt(int irq, void *dev_id); |
314 | static void eepro_rx(struct net_device *dev); | 315 | static void eepro_rx(struct net_device *dev); |
315 | static void eepro_transmit_interrupt(struct net_device *dev); | 316 | static void eepro_transmit_interrupt(struct net_device *dev); |
@@ -1133,7 +1134,8 @@ static void eepro_tx_timeout (struct net_device *dev) | |||
1133 | } | 1134 | } |
1134 | 1135 | ||
1135 | 1136 | ||
1136 | static int eepro_send_packet(struct sk_buff *skb, struct net_device *dev) | 1137 | static netdev_tx_t eepro_send_packet(struct sk_buff *skb, |
1138 | struct net_device *dev) | ||
1137 | { | 1139 | { |
1138 | struct eepro_local *lp = netdev_priv(dev); | 1140 | struct eepro_local *lp = netdev_priv(dev); |
1139 | unsigned long flags; | 1141 | unsigned long flags; |