* [PATCH] e1000e: Do not allow requeue of freed skb
@ 2007-09-21 16:41 Auke Kok
2007-09-29 4:50 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Auke Kok @ 2007-09-21 16:41 UTC (permalink / raw)
To: jeff, davem; +Cc: hadi, krkumar2, netdev
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;
}
e1000_tx_queue(adapter, tx_flags, count);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] e1000e: Do not allow requeue of freed skb
2007-09-21 16:41 [PATCH] e1000e: Do not allow requeue of freed skb Auke Kok
@ 2007-09-29 4:50 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-09-29 4:50 UTC (permalink / raw)
To: Auke Kok; +Cc: davem, hadi, krkumar2, netdev
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-09-29 4:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-21 16:41 [PATCH] e1000e: Do not allow requeue of freed skb Auke Kok
2007-09-29 4:50 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).