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/mip6.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/mip6.c')
-rw-r--r-- | net/ipv6/mip6.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c index 0e7a60f7393a..7fd841d41019 100644 --- a/net/ipv6/mip6.c +++ b/net/ipv6/mip6.c | |||
@@ -155,7 +155,6 @@ static int mip6_destopt_output(struct xfrm_state *x, struct sk_buff *skb) | |||
155 | 155 | ||
156 | skb_push(skb, -skb_network_offset(skb)); | 156 | skb_push(skb, -skb_network_offset(skb)); |
157 | iph = ipv6_hdr(skb); | 157 | iph = ipv6_hdr(skb); |
158 | iph->payload_len = htons(skb->len - sizeof(*iph)); | ||
159 | 158 | ||
160 | nexthdr = *skb_mac_header(skb); | 159 | nexthdr = *skb_mac_header(skb); |
161 | *skb_mac_header(skb) = IPPROTO_DSTOPTS; | 160 | *skb_mac_header(skb) = IPPROTO_DSTOPTS; |
@@ -370,7 +369,6 @@ static int mip6_rthdr_output(struct xfrm_state *x, struct sk_buff *skb) | |||
370 | 369 | ||
371 | skb_push(skb, -skb_network_offset(skb)); | 370 | skb_push(skb, -skb_network_offset(skb)); |
372 | iph = ipv6_hdr(skb); | 371 | iph = ipv6_hdr(skb); |
373 | iph->payload_len = htons(skb->len - sizeof(*iph)); | ||
374 | 372 | ||
375 | nexthdr = *skb_mac_header(skb); | 373 | nexthdr = *skb_mac_header(skb); |
376 | *skb_mac_header(skb) = IPPROTO_ROUTING; | 374 | *skb_mac_header(skb) = IPPROTO_ROUTING; |