]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
tg3: Fix tg3_poll_controller() passing wrong pointer to tg3_interrupt()
authorLouis Rilling <Louis.Rilling@kerlabs.com>
Tue, 9 Mar 2010 06:14:41 +0000 (06:14 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 1 Apr 2010 23:01:10 +0000 (16:01 -0700)
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

index 7f82b0238e08d3e2cc64892b4d317b58c2103270..17d1493bf5f457492de63d083ae92afb7ced5722 100644 (file)
@@ -5223,7 +5223,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