merge linus into test branch

1 files changed, 2 insertions, 1 deletions

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 1aaff0a2e098..2daa0dc19d33 100644
--- a/net/ipv4/route.c
+++ b/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);