From 9be5d785e6e6877701682dedeacf502df74081c3 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Tue, 23 Mar 2010 13:13:12 +0000
Subject: [PATCH] --- yaml --- r: 189035 b: refs/heads/master c:
 1bf1e347ef254ed8a13e7971a30e1bf3983da3d1 h: refs/heads/master i:   189033:
 b5766b68290709add51c531a0db94c2e9fbbd89c   189031:
 8f5f15f745941c970480bf94355be08efefd8af8 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/bnx2.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index daf97ad52993..f89957cd3c46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4327ba435a56ada13eedf3eb332e583c7a0586a9
+refs/heads/master: 1bf1e347ef254ed8a13e7971a30e1bf3983da3d1
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index 417de1cb2d46..a257babd1bb4 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -7646,9 +7646,11 @@ poll_bnx2(struct net_device *dev)
 	int i;
 
 	for (i = 0; i < bp->irq_nvecs; i++) {
-		disable_irq(bp->irq_tbl[i].vector);
-		bnx2_interrupt(bp->irq_tbl[i].vector, &bp->bnx2_napi[i]);
-		enable_irq(bp->irq_tbl[i].vector);
+		struct bnx2_irq *irq = &bp->irq_tbl[i];
+
+		disable_irq(irq->vector);
+		irq->handler(irq->vector, &bp->bnx2_napi[i]);
+		enable_irq(irq->vector);
 	}
 }
 #endif