diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:14:04 -0400 |
commit | d0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (patch) | |
tree | c201ed345e104100288d57c8b3ae46d486b56118 /drivers/net/wireless/wavelan.c | |
parent | 0fc480987e69f22b9212f087545b4d1ca6950807 (diff) |
wireless: convert drivers to netdev_tx_t
Mostly just simple conversions:
* ray_cs had bogus return of NET_TX_LOCKED but driver
was not using NETIF_F_LLTX
* hostap and ipw2x00 had some code that returned value
from a called function that also had to change to return netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/wavelan.c')
-rw-r--r-- | drivers/net/wireless/wavelan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c index 5cb5329a20d1..d634b2da3b84 100644 --- a/drivers/net/wireless/wavelan.c +++ b/drivers/net/wireless/wavelan.c | |||
@@ -2841,7 +2841,8 @@ static int wv_packet_write(struct net_device * dev, void *buf, short length) | |||
2841 | * the packet. We also prevent reentrance. Then we call the function | 2841 | * the packet. We also prevent reentrance. Then we call the function |
2842 | * to send the packet. | 2842 | * to send the packet. |
2843 | */ | 2843 | */ |
2844 | static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev) | 2844 | static netdev_tx_t wavelan_packet_xmit(struct sk_buff *skb, |
2845 | struct net_device * dev) | ||
2845 | { | 2846 | { |
2846 | net_local *lp = netdev_priv(dev); | 2847 | net_local *lp = netdev_priv(dev); |
2847 | unsigned long flags; | 2848 | unsigned long flags; |