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: 3111912971 ("e1000: use disable_hardirq() for e1000_netpoll()")
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
tirimbino
Konstantin Khlebnikov 8 years ago committed by Jeff Kirsher
parent 24ad2a9209
commit fd8e597ba4
  1. 12
      drivers/net/ethernet/intel/e1000e/netdev.c

@ -6743,20 +6743,20 @@ static irqreturn_t e1000_intr_msix(int __always_unused irq, void *data)
vector = 0; vector = 0;
msix_irq = adapter->msix_entries[vector].vector; msix_irq = adapter->msix_entries[vector].vector;
disable_irq(msix_irq); if (disable_hardirq(msix_irq))
e1000_intr_msix_rx(msix_irq, netdev); e1000_intr_msix_rx(msix_irq, netdev);
enable_irq(msix_irq); enable_irq(msix_irq);
vector++; vector++;
msix_irq = adapter->msix_entries[vector].vector; msix_irq = adapter->msix_entries[vector].vector;
disable_irq(msix_irq); if (disable_hardirq(msix_irq))
e1000_intr_msix_tx(msix_irq, netdev); e1000_intr_msix_tx(msix_irq, netdev);
enable_irq(msix_irq); enable_irq(msix_irq);
vector++; vector++;
msix_irq = adapter->msix_entries[vector].vector; msix_irq = adapter->msix_entries[vector].vector;
disable_irq(msix_irq); if (disable_hardirq(msix_irq))
e1000_msix_other(msix_irq, netdev); e1000_msix_other(msix_irq, netdev);
enable_irq(msix_irq); enable_irq(msix_irq);
} }

Loading…
Cancel
Save