Messages in this thread Patch in this message | | | Date | Tue, 22 Jul 2008 16:14:06 -0700 | From | Greg KH <> | Subject | [patch 01/47] b43legacy: Do not return TX_BUSY from op_tx |
| |
2.6.25-stable review patch. If anyone has any objections, please let us know.
------------------ From: Michael Buesch <mb@bu3sch.de>
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>
--- drivers/net/wireless/b43legacy/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
--- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -2350,8 +2350,10 @@ static int b43legacy_op_tx(struct ieee80 } 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; } --
| |