diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-10-10 18:45:52 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:55:56 -0400 |
commit | ceb1eec8291175686d0208e66595ff83bc0624e2 (patch) | |
tree | 83a7fdc7d292f1dbb80f32563d9573810bfe6e42 /net/ipv6/xfrm6_tunnel.c | |
parent | 87bdc48d304191313203df9b98d783e1ab5a55ab (diff) |
[IPSEC]: Move IP length/checksum setting out of transforms
This patch moves the setting of the IP length and checksum fields out of
the transforms and into the xfrmX_output functions. This would help future
efforts in merging the transforms themselves.
It also adds an optimisation to ipcomp due to the fact that the transport
offset is guaranteed to be zero.
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_tunnel.c')
-rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 00a1a3e5237c..3f8a3abde67e 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
@@ -242,12 +242,7 @@ EXPORT_SYMBOL(xfrm6_tunnel_free_spi); | |||
242 | 242 | ||
243 | static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) | 243 | static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) |
244 | { | 244 | { |
245 | struct ipv6hdr *top_iph; | ||
246 | |||
247 | skb_push(skb, -skb_network_offset(skb)); | 245 | skb_push(skb, -skb_network_offset(skb)); |
248 | top_iph = ipv6_hdr(skb); | ||
249 | top_iph->payload_len = htons(skb->len - sizeof(struct ipv6hdr)); | ||
250 | |||
251 | return 0; | 246 | return 0; |
252 | } | 247 | } |
253 | 248 | ||