diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /include/net/xfrm.h | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
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) |