Re: [PATCH] e1000e: Do not allow requeue of freed skb

[Jeff Garzik <jeff@garzik.org>]

Auke Kok wrote:
> From: Krishna Kumar <krkumar2@in.ibm.com>
> 
> 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>
> ---
> 
>  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 372da46..03f7472 100644
> --- a/drivers/net/e1000e/netdev.c
> +++ b/drivers/net/e1000e/netdev.c
> @@ -3537,7 +3537,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;

applied