From 0c99e3fccbd3a31978fe8f2c42cba4d9d2c3777a Mon Sep 17 00:00:00 2001 From: Emil Tantilov Date: Mon, 2 Aug 2010 14:40:52 +0000 Subject: [PATCH] --- yaml --- r: 204026 b: refs/heads/master c: 81a618595a29af6aec615d093feac65ee7329b74 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 56f0c7764f66..232cf3c535f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bfacf96abc747e3a4bafa7550deb0372d7d0e20 +refs/heads/master: 81a618595a29af6aec615d093feac65ee7329b74 diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index 667b527b0312..df5dcd23e4fc 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/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); + } } /**