From f601ac2f15fe2e0260ebad659eca503dacd1b09e Mon Sep 17 00:00:00 2001 From: Andrew Gospodarek Date: Fri, 13 Jun 2008 15:56:30 -0400 Subject: [PATCH] e1000: remove e1000_clean_tx_irq call from e1000_netpoll RHBZ 443034 The call to e1000_clean_tx_irq in e1000_netpoll can race with the call to e1000_clean_tx_irq in e1000_clean. I was able to reproduce these concurrent calls which can result in multiple frees to the skbs on the tx ring buffer. --- drivers/net/e1000/e1000_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 3677181..dcbdc8a 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -5249,7 +5249,6 @@ e1000_netpoll(struct net_device *netdev) disable_irq(adapter->pdev->irq); e1000_intr(adapter->pdev->irq, netdev, NULL); - e1000_clean_tx_irq(adapter, adapter->tx_ring); #ifndef CONFIG_E1000_NAPI adapter->clean_rx(adapter, adapter->rx_ring); #endif -- 1.5.2.1