|
@@ -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
|