diff options
| author | Michael Buesch <mb@bu3sch.de> | 2008-06-15 15:27:49 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-06-25 10:55:09 -0400 |
| commit | 664f200610a3c9641ff58fc91b986b804cb1cc2d (patch) | |
| tree | 86911f1e209a0d16159889fed9a5472203d54ad7 /drivers/net/wireless | |
| parent | c9e8eae0935f03e2d03a7ad7af80d8fc6c53e68c (diff) | |
| download | kernel_samsung_aries-664f200610a3c9641ff58fc91b986b804cb1cc2d.zip kernel_samsung_aries-664f200610a3c9641ff58fc91b986b804cb1cc2d.tar.gz kernel_samsung_aries-664f200610a3c9641ff58fc91b986b804cb1cc2d.tar.bz2 | |
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.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -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 204077c..3e612d0 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -2378,8 +2378,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; } |