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); }