From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Sat, 19 Aug 2006 15:56:28 +0000 (-0500)
Subject: [PATCH] bcm43xx: return correct hard_start_xmit error code
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b6971c2191d910714ec36b0ef50886f12c744a06;p=deliverable%2Flinux.git

[PATCH] bcm43xx: return correct hard_start_xmit error code

hard_start_xmit should return a NETIF_TX_FOO error code.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-Off-By: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index b1e45340bd82..468cd8a376b5 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3918,7 +3918,9 @@ static int bcm43xx_ieee80211_hard_start_xmit(struct ieee80211_txb *txb,
 		err = bcm43xx_tx(bcm, txb);
 	spin_unlock_irqrestore(&bcm->irq_lock, flags);
 
-	return err;
+	if (unlikely(err))
+		return NETDEV_TX_BUSY;
+	return NETDEV_TX_OK;
 }
 
 static struct net_device_stats * bcm43xx_net_get_stats(struct net_device *net_dev)