diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-10-10 15:46:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:55:56 -0700 |
| commit | 631a6698d09e57cadc069914d613899609a0ae83 (patch) | |
| tree | 7e915991e7dea60077e2f160908820c90e34fb18 /net/ipv4/ipcomp.c | |
| parent | ceb1eec8291175686d0208e66595ff83bc0624e2 (diff) | |
| download | kernel_samsung_aries-631a6698d09e57cadc069914d613899609a0ae83.zip kernel_samsung_aries-631a6698d09e57cadc069914d613899609a0ae83.tar.gz kernel_samsung_aries-631a6698d09e57cadc069914d613899609a0ae83.tar.bz2 | |
[IPSEC]: Move IP protocol setting from transforms into xfrm4_input.c
This patch makes the IPv4 x->type->input functions return the next protocol
instead of setting it directly. This is identical to how we do things in
IPv6 and will help us merge common code on the input path.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipcomp.c')
| -rw-r--r-- | net/ipv4/ipcomp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index 32b02de..0bfeb02 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c @@ -75,7 +75,6 @@ out: static int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb) { int err = -ENOMEM; - struct iphdr *iph; struct ip_comp_hdr *ipch; if (skb_linearize_cow(skb)) @@ -84,12 +83,14 @@ static int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb) skb->ip_summed = CHECKSUM_NONE; /* Remove ipcomp header and decompress original payload */ - iph = ip_hdr(skb); ipch = (void *)skb->data; - iph->protocol = ipch->nexthdr; skb->transport_header = skb->network_header + sizeof(*ipch); __skb_pull(skb, sizeof(*ipch)); err = ipcomp_decompress(x, skb); + if (err) + goto out; + + err = ipch->nexthdr; out: return err; |