From a89ff13252d3abff87026e95338911ec1cbb177b Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Wed, 25 Jul 2012 05:11:23 +0000 Subject: [PATCH] --- yaml --- r: 318923 b: refs/heads/master c: 4331debc51ee1ce319f4a389484e0e8e05de2aca h: refs/heads/master i: 318921: 112b72e6f30dd8fb6c2c24c36fd4a3a33bc62a77 318919: ab6a24bcbd4c6778b67f56c48ecf48f40b95d4c7 v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c5b1207d1bae..1ccdb044eff4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d8d2dd8ad92ec89f540e73b7a46c5835a7a06a6 +refs/heads/master: 4331debc51ee1ce319f4a389484e0e8e05de2aca diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 6bcb8fc71cbc..3f7bb7185c50 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -444,7 +444,7 @@ static inline int ip_rt_proc_init(void) } #endif /* CONFIG_PROC_FS */ -static inline int rt_is_expired(struct rtable *rth) +static inline bool rt_is_expired(const struct rtable *rth) { return rth->rt_genid != rt_genid(dev_net(rth->dst.dev)); } @@ -1222,9 +1222,11 @@ static void rt_cache_route(struct fib_nh *nh, struct rtable *rt) } } -static bool rt_cache_valid(struct rtable *rt) +static bool rt_cache_valid(const struct rtable *rt) { - return (rt && rt->dst.obsolete == DST_OBSOLETE_FORCE_CHK); + return rt && + rt->dst.obsolete == DST_OBSOLETE_FORCE_CHK && + !rt_is_expired(rt); } static void rt_set_nexthop(struct rtable *rt, __be32 daddr,