diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-04-01 10:52:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-04-01 10:52:46 +0200 |
| commit | e695633e21ffb6a443a8c2f8b3f095c7f1a48eb0 (patch) | |
| tree | 52a679683a11eb42ec5888309a82ec5811a21e03 /net/ipv6/xfrm6_input.c | |
| parent | [NET]: com90xx kmalloc fix (diff) | |
| download | linux-e695633e21ffb6a443a8c2f8b3f095c7f1a48eb0.tar.xz linux-e695633e21ffb6a443a8c2f8b3f095c7f1a48eb0.zip | |
[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/xfrm6_input.c')
| -rw-r--r-- | net/ipv6/xfrm6_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c index cccf8b76f046..ec7a96e9fa64 100644 --- a/net/ipv6/xfrm6_input.c +++ b/net/ipv6/xfrm6_input.c @@ -65,7 +65,7 @@ int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi) if (xfrm_state_check_expire(x)) goto drop_unlock; - nexthdr = x->type->input(x, &(xfrm_vec[xfrm_nr].decap), skb); + nexthdr = x->type->input(x, skb); if (nexthdr <= 0) goto drop_unlock; |