diff mbox

ipv6: clean up rt6_clean_expires

Message ID 20120416133541.GC18159@midget.suse.cz
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Jiri Bohac April 16, 2012, 1:35 p.m. UTC 
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>

Comments

David Miller April 18, 2012, 2:32 a.m. UTC | #1 
From: Jiri Bohac <jbohac@suse.cz>
Date: Mon, 16 Apr 2012 15:35:41 +0200

> 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>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index c64778f..ad4126f 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)