diff --git a/[refs] b/[refs] index fe2bc812600b..52d2aa67ca6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 100c4673307f5806788791b9b886877c806afd96 +refs/heads/master: f475f163f128a0d9c92dfa90bcb5953fd8f9766f diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index c504ff29d44c..b6a6051db77a 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -6468,6 +6468,9 @@ static void tg3_timer(unsigned long __opaque) { struct tg3 *tp = (struct tg3 *) __opaque; + if (tp->irq_sync) + goto restart_timer; + spin_lock(&tp->lock); if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) { @@ -6558,6 +6561,7 @@ static void tg3_timer(unsigned long __opaque) spin_unlock(&tp->lock); +restart_timer: tp->timer.expires = jiffies + tp->timer_offset; add_timer(&tp->timer); }