Patchwork tg3: Fix tg3_poll_controller() passing wrong pointer to tg3_interrupt()

login
register
mail settings
Submitter Louis Rilling
Date March 9, 2010, 4:14 p.m.
Message ID <1268151281-15012-1-git-send-email-louis.rilling@kerlabs.com>
Download mbox | patch
Permalink /patch/47169/
State Accepted
Delegated to: David Miller
Headers show

Comments

Louis Rilling - March 9, 2010, 4:14 p.m.
[Resending without buggy address for stable. Sorry.]

Commit 09943a1819a240ff4a72f924d0038818fcdd0a90
	Author: Matt Carlson <mcarlson@broadcom.com>
	Date:   Fri Aug 28 14:01:57 2009 +0000

	tg3: Convert ISR parameter to tnapi

forgot to update tg3_poll_controller(), leading to intermittent crashes with
netpoll.

Fix this.

Signed-off-by: Louis Rilling <louis.rilling@kerlabs.com>
Cc: stable@kernel.org
---
 drivers/net/tg3.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - March 10, 2010, 3:33 p.m.
From: Louis Rilling <louis.rilling@kerlabs.com>
Date: Tue,  9 Mar 2010 17:14:41 +0100

> [Resending without buggy address for stable. Sorry.]
> 
> Commit 09943a1819a240ff4a72f924d0038818fcdd0a90
> 	Author: Matt Carlson <mcarlson@broadcom.com>
> 	Date:   Fri Aug 28 14:01:57 2009 +0000
> 
> 	tg3: Convert ISR parameter to tnapi
> 
> forgot to update tg3_poll_controller(), leading to intermittent crashes with
> netpoll.
> 
> Fix this.
> 
> Signed-off-by: Louis Rilling <louis.rilling@kerlabs.com>
> Cc: stable@kernel.org

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 0fa7688..c3b4fe7 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -5279,7 +5279,7 @@  static void tg3_poll_controller(struct net_device *dev)
 	struct tg3 *tp = netdev_priv(dev);
 
 	for (i = 0; i < tp->irq_cnt; i++)
-		tg3_interrupt(tp->napi[i].irq_vec, dev);
+		tg3_interrupt(tp->napi[i].irq_vec, &tp->napi[i]);
 }
 #endif