diff options
| author | David Miller <davem@davemloft.net> | 2017-11-28 21:40:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-30 15:54:26 +0100 |
| commit | 0f6c480f23f49b53644b383c5554e579498347f3 (patch) | |
| tree | 7e1c0f3c4791d546b3a673cd72cc8ec34c3cbc23 /include/net/dst.h | |
| parent | ipv6: Move dst->from into struct rt6_info. (diff) | |
| download | linux-0f6c480f23f49b53644b383c5554e579498347f3.tar.xz linux-0f6c480f23f49b53644b383c5554e579498347f3.zip | |
xfrm: Move dst->path into struct xfrm_dst
The first member of an IPSEC route bundle chain sets it's dst->path to
the underlying ipv4/ipv6 route that carries the bundle.
Stated another way, if one were to follow the xfrm_dst->child chain of
the bundle, the final non-NULL pointer would be the path and point to
either an ipv4 or an ipv6 route.
This is largely used to make sure that PMTU events propagate down to
the correct ipv4 or ipv6 route.
When we don't have the top of an IPSEC bundle 'dst->path == dst'.
Move it down into xfrm_dst and key off of dst->xfrm.
Signed-off-by: David S. Miller <davem@davemloft.net>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Diffstat (limited to 'include/net/dst.h')
| -rw-r--r-- | include/net/dst.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 13c839d8235a..424bff66f16d 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -38,7 +38,6 @@ struct dst_entry { struct dst_ops *ops; unsigned long _metrics; unsigned long expires; - struct dst_entry *path; #ifdef CONFIG_XFRM struct xfrm_state *xfrm; #else @@ -87,7 +86,7 @@ struct dst_entry { * Align __refcnt to a 64 bytes alignment * (L1_CACHE_SIZE would be too much) */ - long __pad_to_align_refcnt[4]; + long __pad_to_align_refcnt[5]; #endif /* * __refcnt wants to be on a different cache line from |