From 51ff7a60e866646a7d5efb03ccd83b322365a97b Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Tue, 27 Jan 2009 16:41:58 -0800 Subject: [PATCH] --- yaml --- r: 130479 b: refs/heads/master c: 15b2bee22a0390d951301b53e83df88d0350c499 h: refs/heads/master i: 130477: 2b7d87b0c1c4b4e0646a2c679493ce9cc9b19caa 130475: fed523aec5e522c873136d48fc156a079a251abe 130471: 2d7e1b6843d11ea6e539326450147c7e907b722c 130463: bcd2f0eb7bdad538b98038aca7fea38db932686d v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9acf3d78cf58..4e0760f6c2b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fa5fdf291c9b58b1cb8b4bb2a0ee57efa21d635 +refs/heads/master: 15b2bee22a0390d951301b53e83df88d0350c499 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 26474c92193f..c986978ce761 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/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