From 57b39d8333d032d04ceb8f0e78c1900c7e02017d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 19 Aug 2006 10:56:28 -0500 Subject: [PATCH] --- yaml --- r: 35235 b: refs/heads/master c: b6971c2191d910714ec36b0ef50886f12c744a06 h: refs/heads/master i: 35233: 7c62324f821ddecbdb9cb38acb1e12fea2ac71bf 35231: d1708c1356a7ecaacb46d317379cac90ac1af635 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d63c4a7a51b3..2c6d63090ce3 100644 --- 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 index b1e45340bd82..468cd8a376b5 100644 --- 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)