From patchwork Tue Jan 27 23:27:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 20532 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.176.167]) by ozlabs.org (Postfix) with ESMTP id E5446DDF2D for ; Wed, 28 Jan 2009 10:27:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751515AbZA0X1e (ORCPT ); Tue, 27 Jan 2009 18:27:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751403AbZA0X1e (ORCPT ); Tue, 27 Jan 2009 18:27:34 -0500 Received: from qmta05.westchester.pa.mail.comcast.net ([76.96.62.48]:59469 "EHLO QMTA05.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751020AbZA0X1d (ORCPT ); Tue, 27 Jan 2009 18:27:33 -0500 Received: from OMTA03.westchester.pa.mail.comcast.net ([76.96.62.27]) by QMTA05.westchester.pa.mail.comcast.net with comcast id 8mMp1b02c0bG4ec55nTZ2u; Tue, 27 Jan 2009 23:27:33 +0000 Received: from lost.foo-projects.org ([63.64.152.142]) by OMTA03.westchester.pa.mail.comcast.net with comcast id 8nTJ1b00434bfcX3PnTL7g; Tue, 27 Jan 2009 23:27:31 +0000 From: Jeff Kirsher Subject: [net-2.6 PATCH] e1000: fix bug with shared interrupt during reset To: davem@davemloft.net Cc: netdev@vger.kernel.org, jeff@garzik.org, Jesse Brandeburg Date: Tue, 27 Jan 2009 15:27:16 -0800 Message-ID: <20090127232714.24458.66863.stgit@lost.foo-projects.org> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jesse Brandeburg A nasty bug was found where an MTU change (or anything else that caused a reset) could race with the interrupt code. The interrupt code was entered by a shared interrupt during the MTU change. This change prevents the interrupt code from running while the driver is in the middle of its reset path. Signed-off-by: Jesse Brandeburg --- drivers/net/e1000/e1000_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 26474c9..c986978 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -31,7 +31,7 @@ char e1000_driver_name[] = "e1000"; static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver"; -#define DRV_VERSION "7.3.20-k3-NAPI" +#define DRV_VERSION "7.3.21-k3-NAPI" const char e1000_driver_version[] = DRV_VERSION; static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation."; @@ -3712,7 +3712,7 @@ static irqreturn_t e1000_intr(int irq, void *data) struct e1000_hw *hw = &adapter->hw; u32 rctl, icr = er32(ICR); - if (unlikely(!icr)) + if (unlikely((!icr) || test_bit(__E1000_RESETTING, &adapter->flags))) return IRQ_NONE; /* Not our interrupt */ /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is