diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
commit | 1c3f45ab2f7f879ea482501c83899505c31f7539 (patch) | |
tree | 672465b3b9b3e2e26a8caf74ed64aa6885c52c13 /include/net/xfrm.h | |
parent | 4bcff1b37e7c3aed914d1ce5b45994adc7dbf455 (diff) | |
parent | e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/net/xfrm.h')
-rw-r--r-- | include/net/xfrm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index e142a256d5dc..d675836ba6c3 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -515,6 +515,8 @@ struct xfrm_dst | |||
515 | struct dst_entry *route; | 515 | struct dst_entry *route; |
516 | u32 route_mtu_cached; | 516 | u32 route_mtu_cached; |
517 | u32 child_mtu_cached; | 517 | u32 child_mtu_cached; |
518 | u32 route_cookie; | ||
519 | u32 path_cookie; | ||
518 | }; | 520 | }; |
519 | 521 | ||
520 | static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) | 522 | static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) |