aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2005-06-20 16:19:41 -0400
committerDavid S. Miller <davem@davemloft.net>2005-06-20 16:19:41 -0400
commitd094cd83c06e06e01d8edb540555f3f64e4081c2 (patch)
treec9aad8ebaebbf0cde7c535bb764a6d6e859125fb /net
parent72cb6962a91f2af9eef69a06198e1949c10259ae (diff)
[IPSEC]: Add xfrm_state_afinfo->init_flags
This patch adds the xfrm_state_afinfo->init_flags hook which allows each address family to perform any common initialisation that does not require a corresponding destructor call. It will be used subsequently to set the XFRM_STATE_NOPMTUDISC flag in IPv4. It also fixes up the error codes returned by xfrm_init_state. 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')
-rw-r--r--net/xfrm/xfrm_state.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 1845b73d69f9..9d206c282cf1 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1058,10 +1058,26 @@ EXPORT_SYMBOL(xfrm_state_mtu);
1058 1058
1059int xfrm_init_state(struct xfrm_state *x) 1059int xfrm_init_state(struct xfrm_state *x)
1060{ 1060{
1061 struct xfrm_state_afinfo *afinfo;
1062 int family = x->props.family;
1061 int err; 1063 int err;
1062 1064
1063 err = -ENOENT; 1065 err = -EAFNOSUPPORT;
1064 x->type = xfrm_get_type(x->id.proto, x->props.family); 1066 afinfo = xfrm_state_get_afinfo(family);
1067 if (!afinfo)
1068 goto error;
1069
1070 err = 0;
1071 if (afinfo->init_flags)
1072 err = afinfo->init_flags(x);
1073
1074 xfrm_state_put_afinfo(afinfo);
1075
1076 if (err)
1077 goto error;
1078
1079 err = -EPROTONOSUPPORT;
1080 x->type = xfrm_get_type(x->id.proto, family);
1065 if (x->type == NULL) 1081 if (x->type == NULL)
1066 goto error; 1082 goto error;
1067 1083