diff options
author | Emil Tantilov <emil.s.tantilov@intel.com> | 2010-08-02 10:40:52 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-03 00:20:22 -0400 |
commit | 81a618595a29af6aec615d093feac65ee7329b74 (patch) | |
tree | 575d2189a2e006902776cfda25f58584729b3a0e | |
parent | 3bfacf96abc747e3a4bafa7550deb0372d7d0e20 (diff) |
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>
-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) | |||
1290 | wr32(E1000_IAM, 0); | 1290 | wr32(E1000_IAM, 0); |
1291 | wr32(E1000_IMC, ~0); | 1291 | wr32(E1000_IMC, ~0); |
1292 | wrfl(); | 1292 | wrfl(); |
1293 | synchronize_irq(adapter->pdev->irq); | 1293 | if (adapter->msix_entries) { |
1294 | int i; | ||
1295 | for (i = 0; i < adapter->num_q_vectors; i++) | ||
1296 | synchronize_irq(adapter->msix_entries[i].vector); | ||
1297 | } else { | ||
1298 | synchronize_irq(adapter->pdev->irq); | ||
1299 | } | ||
1294 | } | 1300 | } |
1295 | 1301 | ||
1296 | /** | 1302 | /** |