aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2x00/ipw2100.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:57 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:14:04 -0400
commitd0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (patch)
treec201ed345e104100288d57c8b3ae46d486b56118 /drivers/net/wireless/ipw2x00/ipw2100.c
parent0fc480987e69f22b9212f087545b4d1ca6950807 (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/ipw2100.c')
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 77457386e0aa..240cff1e6979 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -3330,8 +3330,8 @@ static irqreturn_t ipw2100_interrupt(int irq, void *data)
3330 return IRQ_NONE; 3330 return IRQ_NONE;
3331} 3331}
3332 3332
3333static int ipw2100_tx(struct libipw_txb *txb, struct net_device *dev, 3333static netdev_tx_t ipw2100_tx(struct libipw_txb *txb,
3334 int pri) 3334 struct net_device *dev, int pri)
3335{ 3335{
3336 struct ipw2100_priv *priv = libipw_priv(dev); 3336 struct ipw2100_priv *priv = libipw_priv(dev);
3337 struct list_head *element; 3337 struct list_head *element;
@@ -3369,12 +3369,12 @@ static int ipw2100_tx(struct libipw_txb *txb, struct net_device *dev,
3369 ipw2100_tx_send_data(priv); 3369 ipw2100_tx_send_data(priv);
3370 3370
3371 spin_unlock_irqrestore(&priv->low_lock, flags); 3371 spin_unlock_irqrestore(&priv->low_lock, flags);
3372 return 0; 3372 return NETDEV_TX_OK;
3373 3373
3374 fail_unlock: 3374fail_unlock:
3375 netif_stop_queue(dev); 3375 netif_stop_queue(dev);
3376 spin_unlock_irqrestore(&priv->low_lock, flags); 3376 spin_unlock_irqrestore(&priv->low_lock, flags);
3377 return 1; 3377 return NETDEV_TX_BUSY;
3378} 3378}
3379 3379
3380static int ipw2100_msg_allocate(struct ipw2100_priv *priv) 3380static int ipw2100_msg_allocate(struct ipw2100_priv *priv)