From 15bcc44e1bfa54d7367c530dda690c7bea003071 Mon Sep 17 00:00:00 2001
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Thu, 27 Sep 2012 04:11:00 +0000
Subject: [PATCH] --- yaml --- r: 323240 b: refs/heads/master c:
 bc9259a8bae9e814fc1f775a1b3effa13e6ad330 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/inetpeer.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3961a207e292..73cde0c68992 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68b3f28c11bf896be32ad2a2e151aaa5f4a7c98e
+refs/heads/master: bc9259a8bae9e814fc1f775a1b3effa13e6ad330
diff --git a/trunk/net/ipv4/inetpeer.c b/trunk/net/ipv4/inetpeer.c
index e1e0a4e8fd34..c7527f6b9ad9 100644
--- a/trunk/net/ipv4/inetpeer.c
+++ b/trunk/net/ipv4/inetpeer.c
@@ -510,7 +510,10 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,
 					secure_ipv6_id(daddr->addr.a6));
 		p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
 		p->rate_tokens = 0;
-		p->rate_last = 0;
+		/* 60*HZ is arbitrary, but chosen enough high so that the first
+		 * calculation of tokens is at its maximum.
+		 */
+		p->rate_last = jiffies - 60*HZ;
 		INIT_LIST_HEAD(&p->gc_list);
 
 		/* Link the node. */