aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/route.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r--net/ipv4/route.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 6bcb8fc71cbc..3f7bb7185c50 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -444,7 +444,7 @@ static inline int ip_rt_proc_init(void)
444} 444}
445#endif /* CONFIG_PROC_FS */ 445#endif /* CONFIG_PROC_FS */
446 446
447static inline int rt_is_expired(struct rtable *rth) 447static inline bool rt_is_expired(const struct rtable *rth)
448{ 448{
449 return rth->rt_genid != rt_genid(dev_net(rth->dst.dev)); 449 return rth->rt_genid != rt_genid(dev_net(rth->dst.dev));
450} 450}
@@ -1222,9 +1222,11 @@ static void rt_cache_route(struct fib_nh *nh, struct rtable *rt)
1222 } 1222 }
1223} 1223}
1224 1224
1225static bool rt_cache_valid(struct rtable *rt) 1225static bool rt_cache_valid(const struct rtable *rt)
1226{ 1226{
1227 return (rt && rt->dst.obsolete == DST_OBSOLETE_FORCE_CHK); 1227 return rt &&
1228 rt->dst.obsolete == DST_OBSOLETE_FORCE_CHK &&
1229 !rt_is_expired(rt);
1228} 1230}
1229 1231
1230static void rt_set_nexthop(struct rtable *rt, __be32 daddr, 1232static void rt_set_nexthop(struct rtable *rt, __be32 daddr,