---

yaml --- r: 26639 b: refs/heads/master c: 8c10568 h: refs/heads/master i: 26637: 3f91ca7 26635: 4bf414e 26631: 5c6ed43 26623: 944cb62 v: v3
git-mirror · May 9, 2006 · 379d076 · 379d076
1 parent 5be7ae5
commit 379d076
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 788252e6616afc75098397cc6b0bcb5482ad07ac
+refs/heads/master: 8c1056839e808aad728db86d739ffec71d2d1db8
diff --git a/trunk/net/core/link_watch.c b/trunk/net/core/link_watch.c
@@ -170,13 +170,13 @@ void linkwatch_fire_event(struct net_device *dev)
 		spin_unlock_irqrestore(&lweventlist_lock, flags);
 
 		if (!test_and_set_bit(LW_RUNNING, &linkwatch_flags)) {
-			unsigned long thisevent = jiffies;
+			unsigned long delay = linkwatch_nextevent - jiffies;
 
-			if (thisevent >= linkwatch_nextevent) {
+			/* If we wrap around we'll delay it by at most HZ. */
+			if (!delay || delay > HZ)
 				schedule_work(&linkwatch_work);
-			} else {
-				schedule_delayed_work(&linkwatch_work, linkwatch_nextevent - thisevent);
-			}
+			else
+				schedule_delayed_work(&linkwatch_work, delay);
 		}
 	}
 }