From 6a2ad998acd08ec52b80c97b592aa7abeee7d086 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Mon, 4 May 2009 11:19:42 +0000 Subject: [PATCH] --- yaml --- r: 144601 b: refs/heads/master c: e151a60ad1faffb6241cf7eb6846353df1f33a32 h: refs/heads/master i: 144599: 992befc7ecde3a46411ca11f46e43de8b9287f3e v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9ac490abdb1c..9da03fd56805 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 815bcc2719c12b6f5b511706e2d19728e07f0b02 +refs/heads/master: e151a60ad1faffb6241cf7eb6846353df1f33a32 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 6a46ceed9436..b1419e21b46b 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -3738,7 +3738,7 @@ static irqreturn_t e1000_intr(int irq, void *data) struct e1000_hw *hw = &adapter->hw; u32 rctl, icr = er32(ICR); - if (unlikely((!icr) || test_bit(__E1000_RESETTING, &adapter->flags))) + if (unlikely((!icr) || test_bit(__E1000_DOWN, &adapter->flags))) return IRQ_NONE; /* Not our interrupt */ /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is