iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

e1000: use disable_hardirq() for e1000_netpoll()

Browse Source 
In commit 02cea3958664 ("genirq: Provide disable_hardirq()")
Peter introduced disable_hardirq() for netpoll, but it is forgotten
to use it for e1000.

This patch changes disable_irq() to disable_hardirq() for e1000.

Reported-by: Dave Jones <davej@codemonkey.org.uk>
Suggested-by: Sabrina Dubroca <sd@queasysnail.net>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
WANG Cong 2016-12-10 14:22:42 -08:00 committed by David S. Miller
parent 0266ac4536
commit 3111912971
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/intel/e1000/e1000_main.c
View File

@ -5255,8 +5255,8 @@ static void e1000_netpoll(struct net_device *netdev)
{ {
struct e1000_adapter *adapter = netdev_priv(netdev); struct e1000_adapter *adapter = netdev_priv(netdev);
disable_irq(adapter->pdev->irq); if (disable_hardirq(adapter->pdev->irq))
e1000_intr(adapter->pdev->irq, netdev); e1000_intr(adapter->pdev->irq, netdev);
enable_irq(adapter->pdev->irq); enable_irq(adapter->pdev->irq);
} }
#endif #endif

8
drivers/net/ethernet/intel/e1000e/netdev.c
View File

@ -6755,13 +6755,13 @@ static void e1000_netpoll(struct net_device *netdev)
e1000_intr_msix(adapter->pdev->irq, netdev); e1000_intr_msix(adapter->pdev->irq, netdev);
break; break;
case E1000E_INT_MODE_MSI: case E1000E_INT_MODE_MSI:
disable_irq(adapter->pdev->irq); if (disable_hardirq(adapter->pdev->irq))
e1000_intr_msi(adapter->pdev->irq, netdev); e1000_intr_msi(adapter->pdev->irq, netdev);
enable_irq(adapter->pdev->irq); enable_irq(adapter->pdev->irq);
break; break;
default: /* E1000E_INT_MODE_LEGACY */ default: /* E1000E_INT_MODE_LEGACY */
disable_irq(adapter->pdev->irq); if (disable_hardirq(adapter->pdev->irq))
e1000_intr(adapter->pdev->irq, netdev); e1000_intr(adapter->pdev->irq, netdev);
enable_irq(adapter->pdev->irq); enable_irq(adapter->pdev->irq);
break; break;
} }