diff options
Diffstat (limited to 'net/ipv6/xfrm6_mode_beet.c')
-rw-r--r-- | net/ipv6/xfrm6_mode_beet.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c index bca018d19ec6..42c6ef839e59 100644 --- a/net/ipv6/xfrm6_mode_beet.c +++ b/net/ipv6/xfrm6_mode_beet.c | |||
@@ -24,13 +24,6 @@ | |||
24 | * The top IP header will be constructed per draft-nikander-esp-beet-mode-06.txt. | 24 | * The top IP header will be constructed per draft-nikander-esp-beet-mode-06.txt. |
25 | * The following fields in it shall be filled in by x->type->output: | 25 | * The following fields in it shall be filled in by x->type->output: |
26 | * payload_len | 26 | * payload_len |
27 | * | ||
28 | * On exit, skb->h will be set to the start of the encapsulation header to be | ||
29 | * filled in by x->type->output and the mac header will be set to the | ||
30 | * nextheader field of the extension header directly preceding the | ||
31 | * encapsulation header, or in its absence, that of the top IP header. | ||
32 | * The value of the network header will always point to the top IP header | ||
33 | * while skb->data will point to the payload. | ||
34 | */ | 27 | */ |
35 | static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb) | 28 | static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb) |
36 | { | 29 | { |
@@ -44,7 +37,7 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb) | |||
44 | 37 | ||
45 | skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data); | 38 | skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data); |
46 | skb_set_network_header(skb, -x->props.header_len); | 39 | skb_set_network_header(skb, -x->props.header_len); |
47 | skb_set_transport_header(skb, hdr_len - x->props.header_len); | 40 | skb->transport_header = skb->network_header + hdr_len; |
48 | __skb_pull(skb, hdr_len); | 41 | __skb_pull(skb, hdr_len); |
49 | 42 | ||
50 | top_iph = ipv6_hdr(skb); | 43 | top_iph = ipv6_hdr(skb); |