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/ipw2x00/libipw_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/ipw2x00/libipw_tx.c')
-rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_tx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw_tx.c b/drivers/net/wireless/ipw2x00/libipw_tx.c index 46530ce56ea6..da8beac7fcf3 100644 --- a/drivers/net/wireless/ipw2x00/libipw_tx.c +++ b/drivers/net/wireless/ipw2x00/libipw_tx.c | |||
@@ -252,7 +252,7 @@ static int libipw_classify(struct sk_buff *skb) | |||
252 | 252 | ||
253 | /* Incoming skb is converted to a txb which consists of | 253 | /* Incoming skb is converted to a txb which consists of |
254 | * a block of 802.11 fragment packets (stored as skbs) */ | 254 | * a block of 802.11 fragment packets (stored as skbs) */ |
255 | int libipw_xmit(struct sk_buff *skb, struct net_device *dev) | 255 | netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev) |
256 | { | 256 | { |
257 | struct libipw_device *ieee = netdev_priv(dev); | 257 | struct libipw_device *ieee = netdev_priv(dev); |
258 | struct libipw_txb *txb = NULL; | 258 | struct libipw_txb *txb = NULL; |
@@ -523,8 +523,8 @@ int libipw_xmit(struct sk_buff *skb, struct net_device *dev) | |||
523 | dev_kfree_skb_any(skb); | 523 | dev_kfree_skb_any(skb); |
524 | 524 | ||
525 | if (txb) { | 525 | if (txb) { |
526 | int ret = (*ieee->hard_start_xmit) (txb, dev, priority); | 526 | netdev_tx_t ret = (*ieee->hard_start_xmit)(txb, dev, priority); |
527 | if (ret == 0) { | 527 | if (ret == NETDEV_TX_OK) { |
528 | dev->stats.tx_packets++; | 528 | dev->stats.tx_packets++; |
529 | dev->stats.tx_bytes += txb->payload_size; | 529 | dev->stats.tx_bytes += txb->payload_size; |
530 | return NETDEV_TX_OK; | 530 | return NETDEV_TX_OK; |