Commit 39b89160 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SK_BUFF]: Introduce ipipv6_hdr(), remove skb->h.ipv6h 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0061ce4

include/linux/ipv6.h

+5 −0
Original line number Diff line number Diff line
@@ -228,6 +228,11 @@ static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff *skb) 
	return (struct ipv6hdr *)skb_network_header(skb);

}



static inline struct ipv6hdr *ipipv6_hdr(const struct sk_buff *skb)

{

	return (struct ipv6hdr *)skb->h.raw;

}



/* 

   This structure contains results of exthdrs parsing

   as offsets from skb->nh.

include/linux/skbuff.h

+0 −1
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ struct sk_buff { 
	/* 4 byte hole on 64 bit*/



	union {

		struct ipv6hdr	*ipv6h;

		unsigned char	*raw;

	} h;

net/ipv6/xfrm6_mode_beet.c

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb) 


	skb_reset_network_header(skb);

	top_iph = ipv6_hdr(skb);

	skb->nh.raw = &top_iph->nexthdr;

	skb->h.ipv6h = top_iph + 1;

	skb->h.raw = skb->nh.raw + sizeof(struct ipv6hdr);

	skb->nh.raw += offsetof(struct ipv6hdr, nexthdr);



	ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr);

	ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr);

net/ipv6/xfrm6_mode_tunnel.c

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)

{

	struct ipv6hdr *outer_iph = ipv6_hdr(skb);

	struct ipv6hdr *inner_iph = skb->h.ipv6h;

	struct ipv6hdr *inner_iph = ipipv6_hdr(skb);



	if (INET_ECN_is_ce(ipv6_get_dsfield(outer_iph)))

		IP6_ECN_set_ce(inner_iph);
@@ -55,8 +55,8 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) 


	skb_reset_network_header(skb);

	top_iph = ipv6_hdr(skb);

	skb->nh.raw = &top_iph->nexthdr;

	skb->h.ipv6h = top_iph + 1;

	skb->h.raw = skb->nh.raw + sizeof(struct ipv6hdr);

	skb->nh.raw += offsetof(struct ipv6hdr, nexthdr);



	top_iph->version = 6;

	if (xdst->route->ops->family == AF_INET6) {
@@ -102,7 +102,7 @@ static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb) 
	nh = skb_network_header(skb);

	if (nh[IP6CB(skb)->nhoff] == IPPROTO_IPV6) {

		if (x->props.flags & XFRM_STATE_DECAP_DSCP)

			ipv6_copy_dscp(ipv6_hdr(skb), skb->h.ipv6h);

			ipv6_copy_dscp(ipv6_hdr(skb), ipipv6_hdr(skb));

		if (!(x->props.flags & XFRM_STATE_NOECN))

			ipip6_ecn_decapsulate(skb);

	} else {