aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2006-08-19 10:56:28 -0500
committerJohn W. Linville <linville@tuxdriver.com>2006-08-29 17:06:30 -0400
commitb6971c2191d910714ec36b0ef50886f12c744a06 (patch)
treed0c3a73fd93614cbb330e661784072f9847f1338 /drivers/net
parent80b60fa8488e98ceaecb8f976abe79df50988037 (diff)
downloadlinux-linaro-android-b6971c2191d910714ec36b0ef50886f12c744a06.tar.gz
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index b1e45340bd8..468cd8a376b 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)