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/ipv6/ipcomp6.c | |
| parent | 15901dc93fa4253bfb3661644ecad67c2e83213c (diff) | |
[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/ipv6/ipcomp6.c')
| -rw-r--r-- | net/ipv6/ipcomp6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index d4cfec3f414e..00f3fadfcca7 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c @@ -63,7 +63,7 @@ static void **ipcomp6_scratches; static int ipcomp6_scratch_users; static LIST_HEAD(ipcomp6_tfms_list); -static int ipcomp6_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb) +static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb) { int err = 0; u8 nexthdr = 0; |