diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2005-06-20 13:18:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-06-20 13:18:08 -0700 |
| commit | 72cb6962a91f2af9eef69a06198e1949c10259ae (patch) | |
| tree | 3ae65d1c4e7d7cb7ac05bfc6f457312df45f6996 /net/ipv6/ipcomp6.c | |
| parent | 3f7a87d2fa9b42f7aade43914f060df68cc89cc7 (diff) | |
| download | op-kernel-dev-72cb6962a91f2af9eef69a06198e1949c10259ae.zip op-kernel-dev-72cb6962a91f2af9eef69a06198e1949c10259ae.tar.gz | |
[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/ipcomp6.c')
| -rw-r--r-- | net/ipv6/ipcomp6.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index 6cde531..423feb4 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c @@ -234,14 +234,9 @@ static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x) t->props.mode = 1; memcpy(t->props.saddr.a6, x->props.saddr.a6, sizeof(struct in6_addr)); - t->type = xfrm_get_type(IPPROTO_IPV6, t->props.family); - if (t->type == NULL) + if (xfrm_init_state(t)) goto error; - if (t->type->init_state(t, NULL)) - goto error; - - t->km.state = XFRM_STATE_VALID; atomic_set(&t->tunnel_users, 1); out: @@ -420,7 +415,7 @@ static void ipcomp6_destroy(struct xfrm_state *x) xfrm6_tunnel_free_spi((xfrm_address_t *)&x->props.saddr); } -static int ipcomp6_init_state(struct xfrm_state *x, void *args) +static int ipcomp6_init_state(struct xfrm_state *x) { int err; struct ipcomp_data *ipcd; |
