Skip to content

Commit

Permalink
[TG3]: Skip timer code during full lock
Browse files Browse the repository at this point in the history
Skip the main timer code if interrupts are disabled in the full lock
state.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Michael Chan authored and David S. Miller committed Mar 29, 2006
1 parent 100c467 commit f475f16
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/net/tg3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit f475f16

Please sign in to comment.