diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-10-10 18:44:44 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:55:54 -0400 |
commit | 37fedd3aab6517daec628764c5d66dd8761fbe5f (patch) | |
tree | 12227aec3944168bff04173dccd580240f4496aa /net/ipv6/xfrm6_mode_transport.c | |
parent | 7b277b1a5fb147cb828e5d8b9780cee60f31a9bf (diff) |
[IPSEC]: Use IPv6 calling convention as the convention for x->mode->output
The IPv6 calling convention for x->mode->output is more general and could
help an eventual protocol-generic x->type->output implementation. This
patch adopts it for IPv4 as well and modifies the IPv4 type output functions
accordingly.
It also rewrites the IPv6 mac/transport header calculation to be based off
the network header where practical.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_mode_transport.c')
-rw-r--r-- | net/ipv6/xfrm6_mode_transport.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/ipv6/xfrm6_mode_transport.c b/net/ipv6/xfrm6_mode_transport.c index f2ee186494e..4e344105b3f 100644 --- a/net/ipv6/xfrm6_mode_transport.c +++ b/net/ipv6/xfrm6_mode_transport.c | |||
@@ -18,13 +18,6 @@ | |||
18 | * | 18 | * |
19 | * The IP header and mutable extension headers will be moved forward to make | 19 | * The IP header and mutable extension headers will be moved forward to make |
20 | * space for the encapsulation header. | 20 | * space for the encapsulation header. |
21 | * | ||
22 | * On exit, skb->h will be set to the start of the encapsulation header to be | ||
23 | * filled in by x->type->output and the mac header will be set to the | ||
24 | * nextheader field of the extension header directly preceding the | ||
25 | * encapsulation header, or in its absence, that of the top IP header. | ||
26 | * The value of the network header will always point to the top IP header | ||
27 | * while skb->data will point to the payload. | ||
28 | */ | 21 | */ |
29 | static int xfrm6_transport_output(struct xfrm_state *x, struct sk_buff *skb) | 22 | static int xfrm6_transport_output(struct xfrm_state *x, struct sk_buff *skb) |
30 | { | 23 | { |
@@ -37,7 +30,7 @@ static int xfrm6_transport_output(struct xfrm_state *x, struct sk_buff *skb) | |||
37 | hdr_len = x->type->hdr_offset(x, skb, &prevhdr); | 30 | hdr_len = x->type->hdr_offset(x, skb, &prevhdr); |
38 | skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data); | 31 | skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data); |
39 | skb_set_network_header(skb, -x->props.header_len); | 32 | skb_set_network_header(skb, -x->props.header_len); |
40 | skb_set_transport_header(skb, hdr_len - x->props.header_len); | 33 | skb->transport_header = skb->network_header + hdr_len; |
41 | __skb_pull(skb, hdr_len); | 34 | __skb_pull(skb, hdr_len); |
42 | memmove(ipv6_hdr(skb), iph, hdr_len); | 35 | memmove(ipv6_hdr(skb), iph, hdr_len); |
43 | return 0; | 36 | return 0; |