diff options
| author | Michael Chan <mchan@broadcom.com> | 2006-03-27 23:20:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-03-28 17:02:39 -0800 |
| commit | f475f163f128a0d9c92dfa90bcb5953fd8f9766f (patch) | |
| tree | 877ee6c922e8596a185339599acb0efb6e615ac6 /drivers/net | |
| parent | 100c4673307f5806788791b9b886877c806afd96 (diff) | |
| download | kernel_samsung_espresso10-f475f163f128a0d9c92dfa90bcb5953fd8f9766f.zip kernel_samsung_espresso10-f475f163f128a0d9c92dfa90bcb5953fd8f9766f.tar.gz kernel_samsung_espresso10-f475f163f128a0d9c92dfa90bcb5953fd8f9766f.tar.bz2 | |
[TG3]: Skip timer code during full lock
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tg3.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index c504ff2..b6a6051d 100644 --- a/drivers/net/tg3.c +++ b/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); } |