diff options
author | Krishna Kumar <krkumar2@in.ibm.com> | 2007-09-21 12:41:15 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:53:46 -0400 |
commit | 7b5dfe1aa9faf9fab10960e027a7b1c932580f76 (patch) | |
tree | c8924e42dd18b16aa1b61010ba3022c4a95f8622 /drivers/net/e1000e | |
parent | 7a1f8104c4a477feaf8b4405429119276341a27e (diff) |
e1000e: Do not allow requeue of freed skb
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.
First spotted by Jeff Garzik on 08/13/07.
Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 885d9467f40d..4a21d7df1743 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -3531,7 +3531,7 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
3531 | /* handle pci_map_single() error in e1000_tx_map */ | 3531 | /* handle pci_map_single() error in e1000_tx_map */ |
3532 | dev_kfree_skb_any(skb); | 3532 | dev_kfree_skb_any(skb); |
3533 | spin_unlock_irqrestore(&adapter->tx_queue_lock, irq_flags); | 3533 | spin_unlock_irqrestore(&adapter->tx_queue_lock, irq_flags); |
3534 | return NETDEV_TX_BUSY; | 3534 | return NETDEV_TX_OK; |
3535 | } | 3535 | } |
3536 | 3536 | ||
3537 | e1000_tx_queue(adapter, tx_flags, count); | 3537 | e1000_tx_queue(adapter, tx_flags, count); |