diff options
| author | Herbert Xu | 2007-05-09 08:22:43 +0200 |
|---|---|---|
| committer | David S. Miller | 2007-05-11 08:45:11 +0200 |
| commit | db0ccffed91e234cad99a35f07d5a322f410baa2 (patch) | |
| tree | a83a513181ec767ad533ca30d06837eb107961b7 /net | |
| parent | [NET_SCHED]: teql_enqueue can check limits before skb enqueue (diff) | |
| download | kernel-qcow2-linux-db0ccffed91e234cad99a35f07d5a322f410baa2.tar.gz kernel-qcow2-linux-db0ccffed91e234cad99a35f07d5a322f410baa2.tar.xz kernel-qcow2-linux-db0ccffed91e234cad99a35f07d5a322f410baa2.zip | |
[NET] link_watch: Eliminate potential delay on wrap-around
When the jiffies wrap around or when the system boots up for the first
time, down events can be delayed indefinitely since we no longer
update linkwatch_nextevent when only urgent events are processed.
This patch fixes this by setting linkwatch_nextevent when a
wrap-around occurs.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/link_watch.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/link_watch.c b/net/core/link_watch.c index b5f45799c2f3..4674ae574128 100644 --- a/net/core/link_watch.c +++ b/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); } |