From 1fb2e69bc81f65cbb3480cd7e14b9da9c209acf1 Mon Sep 17 00:00:00 2001 From: Li RongQing Date: Thu, 13 Sep 2012 19:54:57 +0000 Subject: [PATCH] --- yaml --- r: 327995 b: refs/heads/master c: 3fd91fb35847a8b3287f00970efc069de16df8b4 h: refs/heads/master i: 327993: 54f992e746763cd29e682c979e0ba5f0a859dcfc 327991: 184d11d1d17a143be153d98e9cfc98674a09032c v: v3 --- [refs] | 2 +- trunk/net/ipv6/route.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a9ef64913cf4..a9546360d38e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b40863c667c16b7a73d4f034a8eab67029b5b15a +refs/heads/master: 3fd91fb35847a8b3287f00970efc069de16df8b4 diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c index 83dafa528936..0607ee3a0eac 100644 --- a/trunk/net/ipv6/route.c +++ b/trunk/net/ipv6/route.c @@ -369,15 +369,11 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, static bool rt6_check_expired(const struct rt6_info *rt) { - struct rt6_info *ort = NULL; - if (rt->rt6i_flags & RTF_EXPIRES) { if (time_after(jiffies, rt->dst.expires)) return true; } else if (rt->dst.from) { - ort = (struct rt6_info *) rt->dst.from; - return (ort->rt6i_flags & RTF_EXPIRES) && - time_after(jiffies, ort->dst.expires); + return rt6_check_expired((struct rt6_info *) rt->dst.from); } return false; }