[PATCH] E1000: Do not allow requeue of freed skb
From: Krishna Kumar <hidden>
Date: 2007-09-21 04:58:26
From: Krishna Kumar <hidden>
Date: 2007-09-21 04:58:26
Returning BUSY will make qdisc_restart enqueue the skb which was already freed. The bad skb was correctly freed and we should return NETDEV_TX_OK. Signed-off-by: Krishna Kumar <redacted> --- diff -ruNp a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
--- a/drivers/net/e1000e/netdev.c 2007-09-21 10:23:29.000000000 +0530
+++ b/drivers/net/e1000e/netdev.c 2007-09-21 10:24:20.000000000 +0530@@ -3531,7 +3531,7 @@ static int e1000_xmit_frame(struct sk_bu /* handle pci_map_single() error in e1000_tx_map */ dev_kfree_skb_any(skb); spin_unlock_irqrestore(&adapter->tx_queue_lock, irq_flags); - return NETDEV_TX_BUSY; + return NETDEV_TX_OK; } e1000_tx_queue(adapter, tx_flags, count);