[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080625141511.GH22981@gospo.rdu.redhat.com>
Date: Wed, 25 Jun 2008 10:15:11 -0400
From: Andy Gospodarek <andy@...yhouse.net>
To: jeffrey.t.kirsher@...el.com, jesse.brandeburg@...el.com,
bruce.w.allan@...el.com, john.ronciak@...el.com
Cc: netdev@...r.kernel.org
Subject: [PATCH] igb: completely disable interrupts during netpoll
Globally disable the interrupt during netpoll rather than simply
disabling it on the hardware. This will ensure all pending operations
are complete and no more will execute. I've seen reports of deadlocks
with the current driver and this patch resolves them.
---
drivers/net/igb/igb_main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index ae398f0..5ddd1b4 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -4024,7 +4024,7 @@ static void igb_netpoll(struct net_device *netdev)
int i;
int work_done = 0;
- igb_irq_disable(adapter);
+ disable_irq(adapter->pdev->irq);
for (i = 0; i < adapter->num_tx_queues; i++)
igb_clean_tx_irq(adapter, &adapter->tx_ring[i]);
@@ -4033,7 +4033,7 @@ static void igb_netpoll(struct net_device *netdev)
&work_done,
adapter->rx_ring[i].napi.weight);
- igb_irq_enable(adapter);
+ enable_irq(adapter->pdev->irq);
}
#endif /* CONFIG_NET_POLL_CONTROLLER */
--
1.5.2.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists