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

[IPV6]: Move nfheader_len into rt6_info 



The dst member nfheader_len is only used by IPv6.  It's also currently
creating a rather ugly alignment hole in struct dst.  Therefore this patch
moves it from there into struct rt6_info.

It also reorders the fields in rt6_info to minimize holes.

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

include/net/dst.h

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ struct dst_entry 
	unsigned long		expires;



	unsigned short		header_len;	/* more space at head required */

	unsigned short		nfheader_len;	/* more non-fragment space at head required */

	unsigned short		trailer_len;	/* space to reserve at tail */



	u32			metrics[RTAX_MAX];

include/net/ip6_fib.h

+8 −3
Original line number Diff line number Diff line
@@ -99,16 +99,21 @@ struct rt6_info 
	u32				rt6i_flags;

	u32				rt6i_metric;

	atomic_t			rt6i_ref;

	struct fib6_table		*rt6i_table;



	struct rt6key			rt6i_dst;

	struct rt6key			rt6i_src;

	/* more non-fragment space at head required */

	unsigned short			nfheader_len;



	u8				rt6i_protocol;



	struct fib6_table		*rt6i_table;



	struct rt6key			rt6i_dst;



#ifdef CONFIG_XFRM

	u32				rt6i_flow_cache_genid;

#endif



	struct rt6key			rt6i_src;

};



static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)

net/ipv4/xfrm4_policy.c

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ __xfrm4_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	= 0;

		dst_prev->trailer_len	= trailer_len;

		memcpy(&dst_prev->metrics, &x->route->metrics, sizeof(dst_prev->metrics));

net/ipv6/ip6_output.c

+3 −2
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, 
		sk->sk_sndmsg_page = NULL;

		sk->sk_sndmsg_off = 0;

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

			    rt->u.dst.nfheader_len;

			    rt->nfheader_len;

		length += exthdrlen;

		transhdrlen += exthdrlen;

	} else {
@@ -1114,7 +1114,8 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, 


	hh_len = LL_RESERVED_SPACE(rt->u.dst.dev);



	fragheaderlen = sizeof(struct ipv6hdr) + rt->u.dst.nfheader_len + (opt ? opt->opt_nflen : 0);

	fragheaderlen = sizeof(struct ipv6hdr) + rt->nfheader_len +

			(opt ? opt->opt_nflen : 0);

	maxfraglen = ((mtu - fragheaderlen) & ~7) + fragheaderlen - sizeof(struct frag_hdr);



	if (mtu <= sizeof(struct ipv6hdr) + IPV6_MAXPLEN) {

net/ipv6/xfrm6_policy.c

+2 −1
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int 
		dst_prev = dst1;



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

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

			((struct rt6_info *)dst)->nfheader_len +=

				xfrm[i]->props.header_len;

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE