From 3d1d4577c92b72fc100b43e497757f72e059b4cc Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Mon, 9 Jan 2012 12:01:22 +0100 Subject: [PATCH] Avoided enabling timer. --- devices/e1000/e1000_main-2.6.32-ethercat.c | 2 +- devices/e1000/e1000_main-2.6.37-ethercat.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devices/e1000/e1000_main-2.6.32-ethercat.c b/devices/e1000/e1000_main-2.6.32-ethercat.c index 8fbaeb4b..437c08fe 100644 --- a/devices/e1000/e1000_main-2.6.32-ethercat.c +++ b/devices/e1000/e1000_main-2.6.32-ethercat.c @@ -3437,7 +3437,7 @@ static irqreturn_t e1000_intr(int irq, void *data) if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) { hw->get_link_status = 1; /* guard against interrupt when we're going down */ - if (!test_bit(__E1000_DOWN, &adapter->flags)) + if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->flags)) mod_timer(&adapter->watchdog_timer, jiffies + 1); } diff --git a/devices/e1000/e1000_main-2.6.37-ethercat.c b/devices/e1000/e1000_main-2.6.37-ethercat.c index 0b5ec0df..e16ab7e3 100644 --- a/devices/e1000/e1000_main-2.6.37-ethercat.c +++ b/devices/e1000/e1000_main-2.6.37-ethercat.c @@ -3548,7 +3548,7 @@ static irqreturn_t e1000_intr(int irq, void *data) if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) { hw->get_link_status = 1; /* guard against interrupt when we're going down */ - if (!test_bit(__E1000_DOWN, &adapter->flags)) + if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->flags)) mod_timer(&adapter->watchdog_timer, jiffies + 1); }