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/arlan-main.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/arlan-main.c')
-rw-r--r-- | drivers/net/wireless/arlan-main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c index f96c634e2d35..921a082487a1 100644 --- a/drivers/net/wireless/arlan-main.c +++ b/drivers/net/wireless/arlan-main.c | |||
@@ -77,7 +77,7 @@ struct arlan_conf_stru arlan_conf[MAX_ARLANS]; | |||
77 | static int arlans_found; | 77 | static int arlans_found; |
78 | 78 | ||
79 | static int arlan_open(struct net_device *dev); | 79 | static int arlan_open(struct net_device *dev); |
80 | static int arlan_tx(struct sk_buff *skb, struct net_device *dev); | 80 | static netdev_tx_t arlan_tx(struct sk_buff *skb, struct net_device *dev); |
81 | static irqreturn_t arlan_interrupt(int irq, void *dev_id); | 81 | static irqreturn_t arlan_interrupt(int irq, void *dev_id); |
82 | static int arlan_close(struct net_device *dev); | 82 | static int arlan_close(struct net_device *dev); |
83 | static struct net_device_stats * | 83 | static struct net_device_stats * |
@@ -1169,7 +1169,7 @@ static void arlan_tx_timeout (struct net_device *dev) | |||
1169 | } | 1169 | } |
1170 | 1170 | ||
1171 | 1171 | ||
1172 | static int arlan_tx(struct sk_buff *skb, struct net_device *dev) | 1172 | static netdev_tx_t arlan_tx(struct sk_buff *skb, struct net_device *dev) |
1173 | { | 1173 | { |
1174 | short length; | 1174 | short length; |
1175 | unsigned char *buf; | 1175 | unsigned char *buf; |