diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2009-11-20 23:23:16 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-21 11:33:50 -0800 |
commit | a68ea775ad24ff403437c967628d2b9ce531ce48 (patch) | |
tree | 81795e1fc8270b35255b7797fd8bd5bd6f33a337 /drivers/net/e1000e | |
parent | e7d906f714994885b4889d02d6478e7a9418dcbe (diff) | |
download | kernel_samsung_smdk4412-a68ea775ad24ff403437c967628d2b9ce531ce48.zip kernel_samsung_smdk4412-a68ea775ad24ff403437c967628d2b9ce531ce48.tar.gz kernel_samsung_smdk4412-a68ea775ad24ff403437c967628d2b9ce531ce48.tar.bz2 |
e1000e: don't clean Rx ring while resetting
When using legacy interrupts, do not clean the Rx ring while resetting
otherwise traffic will not pass.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 3845fb6..e819f19 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -1176,7 +1176,7 @@ static irqreturn_t e1000_intr(int irq, void *data) struct e1000_hw *hw = &adapter->hw; u32 rctl, icr = er32(ICR); - if (!icr) + if (!icr || test_bit(__E1000_DOWN, &adapter->state)) return IRQ_NONE; /* Not our interrupt */ /* |