Commit:     7b5dfe1aa9faf9fab10960e027a7b1c932580f76
Parent:     7a1f8104c4a477feaf8b4405429119276341a27e
Author:     Krishna Kumar <[EMAIL PROTECTED]>
AuthorDate: Fri Sep 21 09:41:15 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:53:46 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 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 885d946..4a21d7d 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)
                /* handle pci_map_single() error in e1000_tx_map */
                spin_unlock_irqrestore(&adapter->tx_queue_lock, irq_flags);
-               return NETDEV_TX_BUSY;
+               return NETDEV_TX_OK;
        e1000_tx_queue(adapter, tx_flags, count);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to