---

yaml --- r: 327995 b: refs/heads/master c: 3fd91fb h: refs/heads/master i: 327993: 54f992e 327991: 184d11d v: v3
git-mirror · Sep 19, 2012 · 1fb2e69 · 1fb2e69
1 parent fce320e
commit 1fb2e69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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;
 }