diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-04-01 00:52:46 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-04-01 00:52:46 -0800 |
| commit | e695633e21ffb6a443a8c2f8b3f095c7f1a48eb0 (patch) | |
| tree | 52a679683a11eb42ec5888309a82ec5811a21e03 /net/ipv4/esp4.c | |
| parent | 15901dc93fa4253bfb3661644ecad67c2e83213c (diff) | |
| download | kernel_samsung_crespo-e695633e21ffb6a443a8c2f8b3f095c7f1a48eb0.zip kernel_samsung_crespo-e695633e21ffb6a443a8c2f8b3f095c7f1a48eb0.tar.gz kernel_samsung_crespo-e695633e21ffb6a443a8c2f8b3f095c7f1a48eb0.tar.bz2 | |
[IPSEC]: Kill unused decap state argument
This patch removes the decap_state argument from the xfrm input hook.
Previously this function allowed the input hook to share state with
the post_input hook. The latter has since been removed.
The only purpose for it now is to check the encap type. However, it
is easier and better to move the encap type check to the generic
xfrm_rcv function. This allows us to get rid of the decap state
argument altogether.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/esp4.c')
| -rw-r--r-- | net/ipv4/esp4.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index bf88c62..9d1881c 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -133,7 +133,7 @@ error: * expensive, so we only support truncated data, which is the recommended * and common case. */ -static int esp_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb) +static int esp_input(struct xfrm_state *x, struct sk_buff *skb) { struct iphdr *iph; struct ip_esp_hdr *esph; @@ -208,9 +208,6 @@ static int esp_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struc struct xfrm_encap_tmpl *encap = x->encap; struct udphdr *uh; - if (encap->encap_type != decap->decap_type) - goto out; - uh = (struct udphdr *)(iph + 1); encap_len = (void*)esph - (void*)uh; |