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/ipv4/xfrm4_mode_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/ipv4/xfrm4_mode_tunnel.c')
-rw-r--r-- | net/ipv4/xfrm4_mode_tunnel.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c index f1d41ea34785..1ae9d32276f0 100644 --- a/net/ipv4/xfrm4_mode_tunnel.c +++ b/net/ipv4/xfrm4_mode_tunnel.c | |||
@@ -31,10 +31,7 @@ static inline void ipip6_ecn_decapsulate(struct iphdr *iph, struct sk_buff *skb) | |||
31 | 31 | ||
32 | /* Add encapsulation header. | 32 | /* Add encapsulation header. |
33 | * | 33 | * |
34 | * The top IP header will be constructed per RFC 2401. The following fields | 34 | * The top IP header will be constructed per RFC 2401. |
35 | * in it shall be filled in by x->type->output: | ||
36 | * tot_len | ||
37 | * check | ||
38 | */ | 35 | */ |
39 | static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) | 36 | static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) |
40 | { | 37 | { |