diff options
| author |   Emil Tantilov <emil.s.tantilov@intel.com> | 2010-08-02 14:40:52 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-08-02 21:20:22 -0700 |
| commit | 81a618595a29af6aec615d093feac65ee7329b74 (patch) | |
| tree | 575d2189a2e006902776cfda25f58584729b3a0e /drivers/net/igb | |
| parent | ixgbevf: fix null pointer dereference due to filter being set for VLAN 0 (diff) | |
| download | linux-dev-81a618595a29af6aec615d093feac65ee7329b74.tar.xz linux-dev-81a618595a29af6aec615d093feac65ee7329b74.zip | |
igb: Use irq_synchronize per vector when using MSI-X
Synchronize all IRQs when using MSI-X. Similar to ixgbe.
Issue was reported on e1000e, but the patch is also valid for igb.
CC: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb')
| -rw-r--r-- | drivers/net/igb/igb_main.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 667b527b0312..df5dcd23e4fc 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -1290,7 +1290,13 @@ static void igb_irq_disable(struct igb_adapter *adapter) wr32(E1000_IAM, 0); wr32(E1000_IMC, ~0); wrfl(); - synchronize_irq(adapter->pdev->irq); + if (adapter->msix_entries) { + int i; + for (i = 0; i < adapter->num_q_vectors; i++) + synchronize_irq(adapter->msix_entries[i].vector); + } else { + synchronize_irq(adapter->pdev->irq); + } } /** |