From f6839cbba81054de60d7ac313d76b58fdd525a4f Mon Sep 17 00:00:00 2001
From: Li Yewang <lyw@nanjing-fnst.com>
Date: Mon, 18 Dec 2006 00:26:35 -0800
Subject: [PATCH] --- yaml --- r: 44671 b: refs/heads/master c:
 14fb8a764786e37ac26a2175638115f21980e5a3 h: refs/heads/master i:   44669:
 a77cc1df33dfb735e87377d2e6073fd8a2ad0917   44667:
 771203246fd93ab3de753d165228b1b8a1d78227   44663:
 6507cbb5d6b4cf628d58e4688f85d30a743d2fc8   44655:
 db7a839aa7cb5c57d2a1155a82ac1f13f1f7f740   44639:
 5a993ac7d8ee5453103ed236c58a8bccb1e3fce3   44607:
 a89fc7614c1a6a1be5eb27729ff946acee7f82ca   44543:
 5b94516a0625f11d8cc10cc434544b900e7a419e v: v3

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

diff --git a/[refs] b/[refs]
index 7e5972695534..079da40841ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9fc00cca8327dba3ec2a6c727f4b5b1c449f2a2
+refs/heads/master: 14fb8a764786e37ac26a2175638115f21980e5a3
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
index 1aaff0a2e098..2daa0dc19d33 100644
--- a/trunk/net/ipv4/route.c
+++ b/trunk/net/ipv4/route.c
@@ -1325,7 +1325,8 @@ void ip_rt_send_redirect(struct sk_buff *skb)
 	/* Check for load limit; set rate_last to the latest sent
 	 * redirect.
 	 */
-	if (time_after(jiffies,
+	if (rt->u.dst.rate_tokens == 0 ||
+	    time_after(jiffies,
 		       (rt->u.dst.rate_last +
 			(ip_rt_redirect_load << rt->u.dst.rate_tokens)))) {
 		icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST, rt->rt_gateway);