From 7ac780226f4db632ee4bd42ed569c812e0fcc779 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 8 May 2007 23:22:43 -0700
Subject: [PATCH] --- yaml --- r: 55955 b: refs/heads/master c:
 db0ccffed91e234cad99a35f07d5a322f410baa2 h: refs/heads/master i:   55953:
 597b35976a5c0372e3a0854133198a840d2295b3   55951:
 2957ed7b65e61b26e75a5c0b02d055ad3dde753e v: v3

---
 [refs]                      | 2 +-
 trunk/net/core/link_watch.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1e1f65c9103b..b6a7c49b5dd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cd8c9e87be7ea891050ff1bebbf767a837eb5cf
+refs/heads/master: db0ccffed91e234cad99a35f07d5a322f410baa2
diff --git a/trunk/net/core/link_watch.c b/trunk/net/core/link_watch.c
index b5f45799c2f3..4674ae574128 100644
--- a/trunk/net/core/link_watch.c
+++ b/trunk/net/core/link_watch.c
@@ -101,8 +101,10 @@ static void linkwatch_schedule_work(unsigned long delay)
 		return;
 
 	/* If we wrap around we'll delay it by at most HZ. */
-	if (delay > HZ)
+	if (delay > HZ) {
+		linkwatch_nextevent = jiffies;
 		delay = 0;
+	}
 
 	schedule_delayed_work(&linkwatch_work, delay);
 }