Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b5dfe1a authored by Krishna Kumar's avatar Krishna Kumar Committed by David S. Miller
Browse files

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: default avatarKrishna Kumar <krkumar2@in.ibm.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 7a1f8104

drivers/net/e1000e/netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -3531,7 +3531,7 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
		/* 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);