Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ce68ceb authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 274b3426

net/ipv4/xfrm4_policy.c

+3 −2
Original line number Diff line number Diff line
@@ -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)

net/ipv6/xfrm6_policy.c

+4 −2
Original line number Diff line number Diff line
@@ -188,6 +188,10 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int 


	dst_prev->child = &rt->u.dst;

	dst->path = &rt->u.dst;



	/* Copy neighbour for reachability confirmation */

	dst->neighbour = neigh_clone(rt->u.dst.neighbour);



	if (rt->rt6i_node)

		((struct xfrm_dst *)dst)->path_cookie = rt->rt6i_node->fn_sernum;
@@ -210,8 +214,6 @@ __xfrm6_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 neighbour 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;

		/* Sheit... I remember I did this right. Apparently,