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

Commit fd8e597b authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Jeff Kirsher
Browse files

e1000e: use disable_hardirq() also for MSIX vectors in e1000_netpoll() 



Replace disable_irq() which waits for threaded irq handlers with
disable_hardirq() which waits only for hardirq part.

Fixes: 31119129 ("e1000: use disable_hardirq() for e1000_netpoll()")
Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 24ad2a92

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

+6 −6
Original line number Diff line number Diff line
@@ -6743,19 +6743,19 @@ static irqreturn_t e1000_intr_msix(int __always_unused irq, void *data) 


		vector = 0;

		msix_irq = adapter->msix_entries[vector].vector;

		disable_irq(msix_irq);

		if (disable_hardirq(msix_irq))

			e1000_intr_msix_rx(msix_irq, netdev);

		enable_irq(msix_irq);



		vector++;

		msix_irq = adapter->msix_entries[vector].vector;

		disable_irq(msix_irq);

		if (disable_hardirq(msix_irq))

			e1000_intr_msix_tx(msix_irq, netdev);

		enable_irq(msix_irq);



		vector++;

		msix_irq = adapter->msix_entries[vector].vector;

		disable_irq(msix_irq);

		if (disable_hardirq(msix_irq))

			e1000_msix_other(msix_irq, netdev);

		enable_irq(msix_irq);

	}