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/libertas/tx.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/libertas/tx.c')
-rw-r--r-- | drivers/net/wireless/libertas/tx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c index 160cfd8311c0..4c018f7a0a8d 100644 --- a/drivers/net/wireless/libertas/tx.c +++ b/drivers/net/wireless/libertas/tx.c | |||
@@ -57,19 +57,17 @@ static u32 convert_radiotap_rate_to_mv(u8 rate) | |||
57 | * @param skb A pointer to skb which includes TX packet | 57 | * @param skb A pointer to skb which includes TX packet |
58 | * @return 0 or -1 | 58 | * @return 0 or -1 |
59 | */ | 59 | */ |
60 | int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | 60 | netdev_tx_t lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) |
61 | { | 61 | { |
62 | unsigned long flags; | 62 | unsigned long flags; |
63 | struct lbs_private *priv = dev->ml_priv; | 63 | struct lbs_private *priv = dev->ml_priv; |
64 | struct txpd *txpd; | 64 | struct txpd *txpd; |
65 | char *p802x_hdr; | 65 | char *p802x_hdr; |
66 | uint16_t pkt_len; | 66 | uint16_t pkt_len; |
67 | int ret; | 67 | netdev_tx_t ret = NETDEV_TX_OK; |
68 | 68 | ||
69 | lbs_deb_enter(LBS_DEB_TX); | 69 | lbs_deb_enter(LBS_DEB_TX); |
70 | 70 | ||
71 | ret = NETDEV_TX_OK; | ||
72 | |||
73 | /* We need to protect against the queues being restarted before | 71 | /* We need to protect against the queues being restarted before |
74 | we get round to stopping them */ | 72 | we get round to stopping them */ |
75 | spin_lock_irqsave(&priv->driver_lock, flags); | 73 | spin_lock_irqsave(&priv->driver_lock, flags); |