diff options
author | Michael Chan <mchan@broadcom.com> | 2010-03-23 09:13:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-24 02:19:56 -0400 |
commit | 1bf1e347ef254ed8a13e7971a30e1bf3983da3d1 (patch) | |
tree | 51e5d0cbf9a73bf79880e6b9fe54ec6930874cd7 /drivers/net/bnx2.c | |
parent | 4327ba435a56ada13eedf3eb332e583c7a0586a9 (diff) |
bnx2: Use proper handler during netpoll.
Netpoll needs to call the proper handler depending on the IRQ mode
and the vector.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r-- | drivers/net/bnx2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 417de1cb2d46..a257babd1bb4 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -7646,9 +7646,11 @@ poll_bnx2(struct net_device *dev) | |||
7646 | int i; | 7646 | int i; |
7647 | 7647 | ||
7648 | for (i = 0; i < bp->irq_nvecs; i++) { | 7648 | for (i = 0; i < bp->irq_nvecs; i++) { |
7649 | disable_irq(bp->irq_tbl[i].vector); | 7649 | struct bnx2_irq *irq = &bp->irq_tbl[i]; |
7650 | bnx2_interrupt(bp->irq_tbl[i].vector, &bp->bnx2_napi[i]); | 7650 | |
7651 | enable_irq(bp->irq_tbl[i].vector); | 7651 | disable_irq(irq->vector); |
7652 | irq->handler(irq->vector, &bp->bnx2_napi[i]); | ||
7653 | enable_irq(irq->vector); | ||
7652 | } | 7654 | } |
7653 | } | 7655 | } |
7654 | #endif | 7656 | #endif |