From 4b968f7887a9c299cddd0493f052eafc350ae3c7 Mon Sep 17 00:00:00 2001 From: Andy Gospodarek Date: Tue, 17 Jun 2008 12:59:38 -0400 Subject: [PATCH] igb: completely disable irqs in netpoll rather than just in hardware RHBZ 435886 This will actually disable interrupts on the system and make sure that none are pending before continuing. Previously interrupts were just disabled in the hardware. --- 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 dd2ac10..873e1f5 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -4034,7 +4034,7 @@ static void igb_netpoll(struct net_device *netdev) int i; int work_done = 0, work_to_do = adapter->netdev->weight; - 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]); @@ -4042,7 +4042,7 @@ static void igb_netpoll(struct net_device *netdev) igb_clean_rx_irq_adv(adapter, &adapter->rx_ring[i], &work_done, work_to_do); - igb_irq_enable(adapter); + enable_irq(adapter->pdev->irq); } #endif /* CONFIG_NET_POLL_CONTROLLER */ -- 1.5.2.1