aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-15 20:42:27 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:26:03 -0400
commitddc7b8e32b22fe8b45d306b7d99472d4b560add6 (patch)
treeb332f3e1385230d666af36fd52c45f8b7ad1a18f /net/ipv6
parent0a6114d94b6d6f82e81cb8e0d8b0d4cf50739fec (diff)
[SK_BUFF]: Some more layer header conversions
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/xfrm6_mode_beet.c3
-rw-r--r--net/ipv6/xfrm6_mode_ro.c3
-rw-r--r--net/ipv6/xfrm6_mode_transport.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c
index 0cc96ece003d..8a01b0da2ddd 100644
--- a/net/ipv6/xfrm6_mode_beet.c
+++ b/net/ipv6/xfrm6_mode_beet.c
@@ -41,7 +41,8 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
41 iph = ipv6_hdr(skb); 41 iph = ipv6_hdr(skb);
42 42
43 hdr_len = ip6_find_1stfragopt(skb, &prevhdr); 43 hdr_len = ip6_find_1stfragopt(skb, &prevhdr);
44 skb->nh.raw = prevhdr - x->props.header_len; 44 skb_set_network_header(skb,
45 (prevhdr - x->props.header_len) - skb->data);
45 skb_set_transport_header(skb, hdr_len); 46 skb_set_transport_header(skb, hdr_len);
46 memmove(skb->data, iph, hdr_len); 47 memmove(skb->data, iph, hdr_len);
47 48
diff --git a/net/ipv6/xfrm6_mode_ro.c b/net/ipv6/xfrm6_mode_ro.c
index da48ecf3fe96..6ad6d7ac6bd7 100644
--- a/net/ipv6/xfrm6_mode_ro.c
+++ b/net/ipv6/xfrm6_mode_ro.c
@@ -53,7 +53,8 @@ static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb)
53 iph = ipv6_hdr(skb); 53 iph = ipv6_hdr(skb);
54 54
55 hdr_len = x->type->hdr_offset(x, skb, &prevhdr); 55 hdr_len = x->type->hdr_offset(x, skb, &prevhdr);
56 skb->nh.raw = prevhdr - x->props.header_len; 56 skb_set_network_header(skb,
57 (prevhdr - x->props.header_len) - skb->data);
57 skb_set_transport_header(skb, hdr_len); 58 skb_set_transport_header(skb, hdr_len);
58 memmove(skb->data, iph, hdr_len); 59 memmove(skb->data, iph, hdr_len);
59 return 0; 60 return 0;
diff --git a/net/ipv6/xfrm6_mode_transport.c b/net/ipv6/xfrm6_mode_transport.c
index d526f4e9c65e..eb1864b5aae7 100644
--- a/net/ipv6/xfrm6_mode_transport.c
+++ b/net/ipv6/xfrm6_mode_transport.c
@@ -35,7 +35,8 @@ static int xfrm6_transport_output(struct xfrm_state *x, struct sk_buff *skb)
35 iph = ipv6_hdr(skb); 35 iph = ipv6_hdr(skb);
36 36
37 hdr_len = x->type->hdr_offset(x, skb, &prevhdr); 37 hdr_len = x->type->hdr_offset(x, skb, &prevhdr);
38 skb->nh.raw = prevhdr - x->props.header_len; 38 skb_set_network_header(skb,
39 (prevhdr - x->props.header_len) - skb->data);
39 skb_set_transport_header(skb, hdr_len); 40 skb_set_transport_header(skb, hdr_len);
40 memmove(skb->data, iph, hdr_len); 41 memmove(skb->data, iph, hdr_len);
41 return 0; 42 return 0;