diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 13:54:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 13:54:33 -0700 |
| commit | 4ec5240ec367a592834385893200dd4fb369354c (patch) | |
| tree | 3ac9a34948049bff79a2b2ce49c0a3c84e35a748 /net/ipv6/xfrm6_policy.c | |
| parent | f49809fe9b39e22b0f6f75c86295ce216ce3e374 (diff) | |
| parent | b6016b767397258b58163494a869f8f1199e6897 (diff) | |
| download | blackbird-op-linux-4ec5240ec367a592834385893200dd4fb369354c.tar.gz blackbird-op-linux-4ec5240ec367a592834385893200dd4fb369354c.zip | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/xfrm6_policy.c')
| -rw-r--r-- | net/ipv6/xfrm6_policy.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 4429b1a1fe5f..cf1d91e74c82 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -113,6 +113,8 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int xdst = (struct xfrm_dst *)dst1; xdst->route = &rt->u.dst; + if (rt->rt6i_node) + xdst->route_cookie = rt->rt6i_node->fn_sernum; dst1->next = dst_prev; dst_prev = dst1; @@ -137,6 +139,8 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int dst_prev->child = &rt->u.dst; dst->path = &rt->u.dst; + if (rt->rt6i_node) + ((struct xfrm_dst *)dst)->path_cookie = rt->rt6i_node->fn_sernum; *dst_p = dst; dst = dst_prev; |
