lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo
2007-04-10 21:06:25 -07:00
committed by David S. Miller
parent b0061ce49c
commit 39b89160df
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/ipv6.h
View File

@@ -228,6 +228,11 @@ static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff *skb)
return (struct ipv6hdr *)skb_network_header(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 This structure contains results of exthdrs parsing
as offsets from skb->nh. as offsets from skb->nh.

1
include/linux/skbuff.h
View File

@@ -237,7 +237,6 @@ struct sk_buff {
/* 4 byte hole on 64 bit*/ /* 4 byte hole on 64 bit*/
union { union {
struct ipv6hdr *ipv6h;
unsigned char *raw; unsigned char *raw;
} h; } h;

4
net/ipv6/xfrm6_mode_beet.c
View File

@@ -47,8 +47,8 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
skb_reset_network_header(skb); skb_reset_network_header(skb);
top_iph = ipv6_hdr(skb); top_iph = ipv6_hdr(skb);
skb->nh.raw = &top_iph->nexthdr; skb->h.raw = skb->nh.raw + sizeof(struct ipv6hdr);
skb->h.ipv6h = top_iph + 1; skb->nh.raw += offsetof(struct ipv6hdr, nexthdr);
ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr); ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr);
ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr); ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr);

8
net/ipv6/xfrm6_mode_tunnel.c
View File

@@ -19,7 +19,7 @@
static inline void ipip6_ecn_decapsulate(struct sk_buff *skb) static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)
{ {
struct ipv6hdr *outer_iph = ipv6_hdr(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))) if (INET_ECN_is_ce(ipv6_get_dsfield(outer_iph)))
IP6_ECN_set_ce(inner_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); skb_reset_network_header(skb);
top_iph = ipv6_hdr(skb); top_iph = ipv6_hdr(skb);
skb->nh.raw = &top_iph->nexthdr; skb->h.raw = skb->nh.raw + sizeof(struct ipv6hdr);
skb->h.ipv6h = top_iph + 1; skb->nh.raw += offsetof(struct ipv6hdr, nexthdr);
top_iph->version = 6; top_iph->version = 6;
if (xdst->route->ops->family == AF_INET6) { 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); nh = skb_network_header(skb);
if (nh[IP6CB(skb)->nhoff] == IPPROTO_IPV6) { if (nh[IP6CB(skb)->nhoff] == IPPROTO_IPV6) {
if (x->props.flags & XFRM_STATE_DECAP_DSCP) 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)) if (!(x->props.flags & XFRM_STATE_NOECN))
ipip6_ecn_decapsulate(skb); ipip6_ecn_decapsulate(skb);
} else { } else {