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/cs89x0.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/cs89x0.c')
-rw-r--r-- | drivers/net/cs89x0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 839cac5fd8a5..0c54219960e2 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
@@ -246,7 +246,7 @@ struct net_local { | |||
246 | 246 | ||
247 | static int cs89x0_probe1(struct net_device *dev, int ioaddr, int modular); | 247 | static int cs89x0_probe1(struct net_device *dev, int ioaddr, int modular); |
248 | static int net_open(struct net_device *dev); | 248 | static int net_open(struct net_device *dev); |
249 | static int net_send_packet(struct sk_buff *skb, struct net_device *dev); | 249 | static netdev_tx_t net_send_packet(struct sk_buff *skb, struct net_device *dev); |
250 | static irqreturn_t net_interrupt(int irq, void *dev_id); | 250 | static irqreturn_t net_interrupt(int irq, void *dev_id); |
251 | static void set_multicast_list(struct net_device *dev); | 251 | static void set_multicast_list(struct net_device *dev); |
252 | static void net_timeout(struct net_device *dev); | 252 | static void net_timeout(struct net_device *dev); |
@@ -1518,7 +1518,7 @@ static void net_timeout(struct net_device *dev) | |||
1518 | netif_wake_queue(dev); | 1518 | netif_wake_queue(dev); |
1519 | } | 1519 | } |
1520 | 1520 | ||
1521 | static int net_send_packet(struct sk_buff *skb, struct net_device *dev) | 1521 | static netdev_tx_t net_send_packet(struct sk_buff *skb,struct net_device *dev) |
1522 | { | 1522 | { |
1523 | struct net_local *lp = netdev_priv(dev); | 1523 | struct net_local *lp = netdev_priv(dev); |
1524 | unsigned long flags; | 1524 | unsigned long flags; |