]> err.no Git - linux-2.6/commitdiff
[PATCH] bcm43xx: return correct hard_start_xmit error code
authorLarry Finger <Larry.Finger@lwfinger.net>
Sat, 19 Aug 2006 15:56:28 +0000 (10:56 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Aug 2006 21:06:30 +0000 (17:06 -0400)
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>
drivers/net/wireless/bcm43xx/bcm43xx_main.c

index b1e45340bd82cd34caf10a37bc0037bc63c179ee..468cd8a376b5abd5cad069880886fb5c1a154ee3 100644 (file)
@@ -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)