From c150c6dec88b22a58226c0520eb0c4f740d24179 Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Tue, 23 Aug 2005 10:10:15 -0700 Subject: [PATCH] --- yaml --- r: 5923 b: refs/heads/master c: 1344a41637114485fac7afa1505bce2ff862807a h: refs/heads/master i: 5921: d63762793d3f3a7fd723aaad05f17a725ffb1290 5919: 77d656f51de2b07086268dd056855e9ff251c60b v: v3 --- [refs] | 2 +- trunk/net/ipv4/inetpeer.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 13b29e9937c0..6ab426b72026 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3a20692ca5c8eb8cf5d0f489d4fc839ce7593d1 +refs/heads/master: 1344a41637114485fac7afa1505bce2ff862807a diff --git a/trunk/net/ipv4/inetpeer.c b/trunk/net/ipv4/inetpeer.c index 95473953c406..ab18a853d7ce 100644 --- a/trunk/net/ipv4/inetpeer.c +++ b/trunk/net/ipv4/inetpeer.c @@ -450,10 +450,13 @@ static void peer_check_expire(unsigned long dummy) /* Trigger the timer after inet_peer_gc_mintime .. inet_peer_gc_maxtime * interval depending on the total number of entries (more entries, * less interval). */ - peer_periodic_timer.expires = jiffies - + inet_peer_gc_maxtime - - (inet_peer_gc_maxtime - inet_peer_gc_mintime) / HZ * - peer_total / inet_peer_threshold * HZ; + if (peer_total >= inet_peer_threshold) + peer_periodic_timer.expires = jiffies + inet_peer_gc_mintime; + else + peer_periodic_timer.expires = jiffies + + inet_peer_gc_maxtime + - (inet_peer_gc_maxtime - inet_peer_gc_mintime) / HZ * + peer_total / inet_peer_threshold * HZ; add_timer(&peer_periodic_timer); }