---

yaml --- r: 35235 b: refs/heads/master c: b6971c2 h: refs/heads/master i: 35233: 7c62324 35231: d1708c1 v: v3
git-mirror · Aug 29, 2006 · 57b39d8 · 57b39d8
1 parent a797b04
commit 57b39d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80b60fa8488e98ceaecb8f976abe79df50988037
+refs/heads/master: b6971c2191d910714ec36b0ef50886f12c744a06
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/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)