[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>
This commit is contained in:
committed by
David S. Miller
parent
3f7a87d2fa
commit
72cb6962a9
@@ -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;
|
||||
|
Reference in New Issue
Block a user