diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2005-06-20 22:18:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-06-20 22:18:08 +0200 |
| commit | 72cb6962a91f2af9eef69a06198e1949c10259ae (patch) | |
| tree | 3ae65d1c4e7d7cb7ac05bfc6f457312df45f6996 /net/ipv6/xfrm6_tunnel.c | |
| parent | [SCTP] sctp_connectx() API support (diff) | |
| download | linux-72cb6962a91f2af9eef69a06198e1949c10259ae.tar.xz linux-72cb6962a91f2af9eef69a06198e1949c10259ae.zip | |
[IPSEC]: Add xfrm_init_state
This patch adds xfrm_init_state which is simply a wrapper that calls
xfrm_get_type and subsequently x->type->init_state. It also gets rid
of the unused args argument.
Abstracting it out allows us to add common initialisation code, e.g.,
to set family-specific flags.
The add_time setting in xfrm_user.c was deleted because it's already
set by xfrm_state_alloc.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_tunnel.c')
| -rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index ffcadd68b951..60c26c87277e 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c @@ -466,7 +466,7 @@ static void xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt, return; } -static int xfrm6_tunnel_init_state(struct xfrm_state *x, void *args) +static int xfrm6_tunnel_init_state(struct xfrm_state *x) { if (!x->props.mode) return -EINVAL; |