bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoided enabling timer.

This commit is contained in:
Florian Pose 2012-01-09 12:01:22 +01:00
parent 623efeeeb7
commit 3d1d4577c9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/e1000/e1000_main-2.6.32-ethercat.c
View File

@ -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);
}

2
devices/e1000/e1000_main-2.6.37-ethercat.c
View File

@ -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);
}