Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31119129 authored Dec 10, 2016 by WANG Cong Committed by David S. Miller Dec 10, 2016

e1000: use disable_hardirq() for e1000_netpoll()



In commit 02cea395 ("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>

parent 0266ac45

drivers/net/ethernet/intel/e1000/e1000_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -5255,7 +5255,7 @@ static void e1000_netpoll(struct net_device *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);
		enable_irq(adapter->pdev->irq);
		}

drivers/net/ethernet/intel/e1000e/netdev.c

+4 −4

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