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/netwave_cs.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/netwave_cs.c')
-rw-r--r-- | drivers/net/wireless/netwave_cs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index 712f26eef35d..9498b46c99a4 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
@@ -203,7 +203,8 @@ static int netwave_open(struct net_device *dev); /* Open the device */ | |||
203 | static int netwave_close(struct net_device *dev); /* Close the device */ | 203 | static int netwave_close(struct net_device *dev); /* Close the device */ |
204 | 204 | ||
205 | /* Packet transmission and Packet reception */ | 205 | /* Packet transmission and Packet reception */ |
206 | static int netwave_start_xmit( struct sk_buff *skb, struct net_device *dev); | 206 | static netdev_tx_t netwave_start_xmit( struct sk_buff *skb, |
207 | struct net_device *dev); | ||
207 | static int netwave_rx( struct net_device *dev); | 208 | static int netwave_rx( struct net_device *dev); |
208 | 209 | ||
209 | /* Interrupt routines */ | 210 | /* Interrupt routines */ |
@@ -1026,7 +1027,8 @@ static int netwave_hw_xmit(unsigned char* data, int len, | |||
1026 | return 0; | 1027 | return 0; |
1027 | } | 1028 | } |
1028 | 1029 | ||
1029 | static int netwave_start_xmit(struct sk_buff *skb, struct net_device *dev) { | 1030 | static netdev_tx_t netwave_start_xmit(struct sk_buff *skb, |
1031 | struct net_device *dev) { | ||
1030 | /* This flag indicate that the hardware can't perform a transmission. | 1032 | /* This flag indicate that the hardware can't perform a transmission. |
1031 | * Theoritically, NET3 check it before sending a packet to the driver, | 1033 | * Theoritically, NET3 check it before sending a packet to the driver, |
1032 | * but in fact it never do that and pool continuously. | 1034 | * but in fact it never do that and pool continuously. |