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/xfrm/xfrm_user.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/xfrm/xfrm_user.c')
| -rw-r--r-- | net/xfrm/xfrm_user.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 5ce8558..ecade48 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -249,17 +249,10 @@ static struct xfrm_state *xfrm_state_construct(struct xfrm_usersa_info *p, if ((err = attach_encap_tmpl(&x->encap, xfrma[XFRMA_ENCAP-1]))) goto error; - err = -ENOENT; - x->type = xfrm_get_type(x->id.proto, x->props.family); - if (x->type == NULL) - goto error; - - err = x->type->init_state(x, NULL); + err = xfrm_init_state(x); if (err) goto error; - x->curlft.add_time = (unsigned long) xtime.tv_sec; - x->km.state = XFRM_STATE_VALID; x->km.seq = p->seq; return x; |
