diff options
| author | Jiri Bohac <jbohac@suse.cz> | 2012-04-16 03:35:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-17 22:31:59 -0400 |
| commit | cda31e10baf47a8a7d9360d9488fb76294be1ca3 (patch) | |
| tree | 7bc647cff2900f21a493718754b5261d96562564 /include/net | |
| parent | edfb5d4687d587c9f714799c7ee27517118e12e6 (diff) | |
| download | linux-3.10-cda31e10baf47a8a7d9360d9488fb76294be1ca3.tar.gz linux-3.10-cda31e10baf47a8a7d9360d9488fb76294be1ca3.tar.bz2 linux-3.10-cda31e10baf47a8a7d9360d9488fb76294be1ca3.zip | |
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>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip6_fib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index cb8da1dac51..0ae759a6c76 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) |