From: Jiri Bohac <jbohac@suse.cz>
Date: Mon, 16 Apr 2012 03:35:41 +0000 (+0000)
Subject: ipv6: clean up rt6_clean_expires
X-Git-Tag: firefly_0821_release~3680^2~3019^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cda31e10baf47a8a7d9360d9488fb76294be1ca3;p=firefly-linux-kernel-4.4.55.git

ipv6: clean up rt6_clean_expires

Functionally, this change is a NOP.

Semantically, rt6_clean_expires() wants to do rt->dst.from = NULL instead of
rt->dst.expires = 0. It is clearing the RTF_EXPIRES flag, so the union is going
to be treated as a pointer (dst.from) not a long (dst.expires).

Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index cb8da1dac512..0ae759a6c76e 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -129,7 +129,7 @@ static inline void rt6_clean_expires(struct rt6_info *rt)
 		dst_release(rt->dst.from);
 
 	rt->rt6i_flags &= ~RTF_EXPIRES;
-	rt->dst.expires = 0;
+	rt->dst.from = NULL;
 }
 
 static inline void rt6_set_expires(struct rt6_info *rt, unsigned long expires)