summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLouis Rilling <Louis.Rilling@kerlabs.com>2010-03-09 06:14:41 +0000
committerDavid S. Miller <davem@davemloft.net>2010-03-10 07:32:27 -0800
commitfe234f0e5cbb880792d2d1ac0743cf8c07e9dde3 (patch)
treeb0529e0392cb4ae255978f09bff70f96e679cfda /drivers/net
parent78cb27939ff4fd66d7f76cfe7c59c0fdf1b29ed8 (diff)
tg3: Fix tg3_poll_controller() passing wrong pointer to tg3_interrupt()
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 Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tg3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 0fa7688ab48..c3b4fe74cd6 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