| Date | Tue, 30 Mar 2010 15:40:39 -0700 | From | Greg KH <> | Subject | [005/156] tg3: Fix tg3_poll_controller() passing wrong pointer to tg3_interrupt() |
| |
2.6.33-stable review patch. If anyone has any objections, please let us know.
------------------
From: Louis Rilling <Louis.Rilling@kerlabs.com>
commit fe234f0e5cbb880792d2d1ac0743cf8c07e9dde3 upstream.
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> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/net/tg3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -5223,7 +5223,7 @@ static void tg3_poll_controller(struct n 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
|