diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-16 01:15:50 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-16 01:15:50 +0300 |
| commit | e63e904c629ac7c092b17328aeed88ca6e437ed3 (patch) | |
| tree | a89c1669beceedfd440dfeda07a5046e17e43124 /include | |
| parent | 9001d94dfd558f175bede9f847276f691cd9c164 (diff) | |
| parent | 02bcf4e082e4dc634409a6a6cb7def8806d6e5e6 (diff) | |
| download | linux-e63e904c629ac7c092b17328aeed88ca6e437ed3.tar.xz | |
Merge branch 'ipv6-route-fixes'
Martin KaFai Lau says:
====================
ipv6: Fixes for pmtu update and DST_NOCACHE route
This patchset fixes:
1. An oops during IPv6 pmtu update on a IPv4 GRE running
in an IPSec setup
2. Misc fixes on DST_NOCACHE route
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ip6_fib.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index aaf9700fc9e5..fb961a576abe 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -167,7 +167,8 @@ static inline void rt6_update_expires(struct rt6_info *rt0, int timeout) static inline u32 rt6_get_cookie(const struct rt6_info *rt) { - if (rt->rt6i_flags & RTF_PCPU || unlikely(rt->dst.flags & DST_NOCACHE)) + if (rt->rt6i_flags & RTF_PCPU || + (unlikely(rt->dst.flags & DST_NOCACHE) && rt->dst.from)) rt = (struct rt6_info *)(rt->dst.from); return rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0; |