diff options
| author | Michael Buesch <mb@bu3sch.de> | 2008-07-03 01:06:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-24 09:14:01 -0700 |
| commit | da71a4347bcba891f568e3fb66c5916c953d4417 (patch) | |
| tree | 87ef1dacabd92235bac23f4e7cab616694e40ac3 | |
| parent | 6daa065a07f0fa50d1f9d16afec33c767ae31723 (diff) | |
| download | lwn-da71a4347bcba891f568e3fb66c5916c953d4417.tar.gz lwn-da71a4347bcba891f568e3fb66c5916c953d4417.zip | |
b43legacy: Do not return TX_BUSY from op_tx
Never return TX_BUSY from op_tx. It doesn't make sense to return
TX_BUSY, if we can not transmit the packet.
Drop the packet and return TX_OK.
Upstream commit is
eb803e419ca6be06ece2e42027bb4ebd8ec09f91
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 0f7a6e7bd96a..531aeb22230f 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -2350,8 +2350,10 @@ static int b43legacy_op_tx(struct ieee80211_hw *hw, } else err = b43legacy_dma_tx(dev, skb, ctl); out: - if (unlikely(err)) - return NETDEV_TX_BUSY; + if (unlikely(err)) { + /* Drop the packet. */ + dev_kfree_skb_any(skb); + } return NETDEV_TX_OK; } |