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

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

[IPV6]: Only set nfheader_len for top xfrm dst 



We only need to set nfheader_len in the top xfrm dst.  This is because
we only ever read the nfheader_len from the top xfrm dst.

It is also easier to count nfheader_len as part of header_len which
then lets us remove the ugly wrapper functions for incrementing and
decrementing header lengths in xfrm6_policy.c.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b24b8a24

net/ipv6/ip6_output.c

+2 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,8 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, 
		inet->cork.length = 0;

		sk->sk_sndmsg_page = NULL;

		sk->sk_sndmsg_off = 0;

		exthdrlen = rt->u.dst.header_len + (opt ? opt->opt_flen : 0);

		exthdrlen = rt->u.dst.header_len + (opt ? opt->opt_flen : 0) -

			    rt->u.dst.nfheader_len;

		length += exthdrlen;

		transhdrlen += exthdrlen;

	} else {

net/ipv6/xfrm6_policy.c

+4 −22
Original line number Diff line number Diff line
@@ -102,24 +102,6 @@ __xfrm6_bundle_addr_local(struct xfrm_state *x, struct in6_addr *addr) 
		(struct in6_addr*)&x->props.saddr;

}



static inline void

__xfrm6_bundle_len_inc(int *len, int *nflen, struct xfrm_state *x)

{

	if (x->type->flags & XFRM_TYPE_NON_FRAGMENT)

		*nflen += x->props.header_len;

	else

		*len += x->props.header_len;

}



static inline void

__xfrm6_bundle_len_dec(int *len, int *nflen, struct xfrm_state *x)

{

	if (x->type->flags & XFRM_TYPE_NON_FRAGMENT)

		*nflen -= x->props.header_len;

	else

		*len -= x->props.header_len;

}



/* Allocate chain of dst_entry's, attach known xfrm's, calculate

 * all the metrics... Shortly, bundle a bundle.

 */
@@ -142,7 +124,6 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int 
	int i;

	int err = 0;

	int header_len = 0;

	int nfheader_len = 0;

	int trailer_len = 0;



	dst = dst_prev = NULL;
@@ -175,7 +156,9 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int 
		dst1->next = dst_prev;

		dst_prev = dst1;



		__xfrm6_bundle_len_inc(&header_len, &nfheader_len, xfrm[i]);

		if (xfrm[i]->type->flags & XFRM_TYPE_NON_FRAGMENT)

			dst->nfheader_len += xfrm[i]->props.header_len;

		header_len += xfrm[i]->props.header_len;

		trailer_len += xfrm[i]->props.trailer_len;



		if (xfrm[i]->props.mode != XFRM_MODE_TRANSPORT) {
@@ -223,7 +206,6 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int 
		dst_prev->flags	       |= DST_HOST;

		dst_prev->lastuse	= jiffies;

		dst_prev->header_len	= header_len;

		dst_prev->nfheader_len	= nfheader_len;

		dst_prev->trailer_len	= trailer_len;

		memcpy(&dst_prev->metrics, &x->route->metrics, sizeof(dst_prev->metrics));
@@ -242,7 +224,7 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int 
		x->u.rt6.rt6i_src      = rt0->rt6i_src;

		x->u.rt6.rt6i_idev     = rt0->rt6i_idev;

		in6_dev_hold(rt0->rt6i_idev);

		__xfrm6_bundle_len_dec(&header_len, &nfheader_len, x->u.dst.xfrm);

		header_len -= x->u.dst.xfrm->props.header_len;

		trailer_len -= x->u.dst.xfrm->props.trailer_len;

	}