From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932654Ab0CaASs (ORCPT ); Tue, 30 Mar 2010 20:18:48 -0400 Received: from kroah.org ([198.145.64.141]:51709 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756381Ab0C3XRY (ORCPT ); Tue, 30 Mar 2010 19:17:24 -0400 X-Mailbox-Line: From linux@linux.site Tue Mar 30 15:56:00 2010 Message-Id: <20100330225559.723029319@linux.site> User-Agent: quilt/0.47-14.9 Date: Tue, 30 Mar 2010 15:54:44 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Louis Rilling , "David S. Miller" , Greg Kroah-Hartman Subject: [006/116] tg3: Fix tg3_poll_controller() passing wrong pointer to tg3_interrupt() In-Reply-To: <20100330230600.GA28802@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ From: Louis Rilling commit fe234f0e5cbb880792d2d1ac0743cf8c07e9dde3 upstream. Commit 09943a1819a240ff4a72f924d0038818fcdd0a90 Author: Matt Carlson 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/tg3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -4995,7 +4995,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