diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-21 10:16:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-21 10:16:13 +0000 |
| commit | d768ff6691aaa3f2009df4a701f2c42e964d901e (patch) | |
| tree | 175d12d8fce10b3510d37ebe5cb0a13884ae866a /include/net/ip6_fib.h | |
| parent | 54a3a4d441e9eaceb86989f0b466e77815ab6129 (diff) | |
| parent | a4c01ca3b76b28c41fb3b07a1eb1389dae24bf4a (diff) | |
Merge tag 'v3.10.20' into linux-linaro-lsk
This is the 3.10.20 stable release
Diffstat (limited to 'include/net/ip6_fib.h')
| -rw-r--r-- | include/net/ip6_fib.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 2a601e7da1b..665e0cee59b 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -165,6 +165,7 @@ static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst) static inline void rt6_clean_expires(struct rt6_info *rt) { rt->rt6i_flags &= ~RTF_EXPIRES; + rt->dst.expires = 0; } static inline void rt6_set_expires(struct rt6_info *rt, unsigned long expires) |