diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-11-13 21:35:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:53:39 -0800 |
| commit | 8ce68ceb55fb62d2c8e9a3e94c4ef6ff3e3064ce (patch) | |
| tree | 4e226631c52d896d9a30120944a4d122874c3346 /net/ipv4/xfrm4_policy.c | |
| parent | 274b3426db25b8d63cbf25475e728ce1ee6caebd (diff) | |
[IPSEC]: Only set neighbour on top xfrm dst
The neighbour field is only used by dst_confirm which only ever happens on
the top-most xfrm dst. So it's a waste to duplicate for every other xfrm
dst. This patch moves its setting out of the loop so that only the top one
gets set.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_policy.c')
| -rw-r--r-- | net/ipv4/xfrm4_policy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index 5ee3a2f9fb27..7d250a1bd2cf 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c @@ -144,6 +144,9 @@ __xfrm4_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int dst_prev->child = &rt->u.dst; dst->path = &rt->u.dst; + /* Copy neighbout for reachability confirmation */ + dst->neighbour = neigh_clone(rt->u.dst.neighbour); + *dst_p = dst; dst = dst_prev; @@ -164,8 +167,6 @@ __xfrm4_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int dst_prev->trailer_len = trailer_len; memcpy(&dst_prev->metrics, &x->route->metrics, sizeof(dst_prev->metrics)); - /* Copy neighbout for reachability confirmation */ - dst_prev->neighbour = neigh_clone(rt->u.dst.neighbour); dst_prev->input = rt->u.dst.input; dst_prev->output = dst_prev->xfrm->outer_mode->afinfo->output; if (rt0->peer) |