From patchwork Tue Mar 9 15:47:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Louis Rilling X-Patchwork-Id: 47165 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 25D8FB7D14 for ; Wed, 10 Mar 2010 02:47:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753969Ab0CIPrn (ORCPT ); Tue, 9 Mar 2010 10:47:43 -0500 Received: from bohort.kerlabs.com ([62.160.40.57]:53585 "EHLO bohort.kerlabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752154Ab0CIPrm (ORCPT ); Tue, 9 Mar 2010 10:47:42 -0500 Received: from localhost.localdomain (hawkmoon.kerlabs.com [::ffff:10.3.0.7]) (AUTH: LOGIN louis, SSL: TLSv1/SSLv3,256bits,AES256-SHA) by bohort.kerlabs.com with esmtp; Tue, 09 Mar 2010 16:46:21 +0100 id 0000000000B445FB.000000004B966D4D.00000EE0 From: Louis Rilling To: mcarlson@broadcom.com Cc: mchan@broadcom.com, netdev@vger.kernel.org, Louis Rilling , stable@vger.kernel.org Subject: [PATCH] tg3: Fix tg3_poll_controller() passing wrong pointer to tg3_interrupt() Date: Tue, 9 Mar 2010 16:47:35 +0100 Message-Id: <1268149655-13193-1-git-send-email-louis.rilling@kerlabs.com> X-Mailer: git-send-email 1.5.6.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cc: stable@vger.kernel.org --- drivers/net/tg3.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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