aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMiika Komu <miika@iki.fi>2007-02-06 17:24:56 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-08 15:39:00 -0500
commitcdca72652adf597f7fef821a27595fd0dd5eea19 (patch)
tree4a11752d72f70b2248aa811c165cc95007d21a8f /net
parent243cb4e56061c3f4cb76312c5527840344d57c3b (diff)
[IPSEC]: exporting xfrm_state_afinfo
This patch exports xfrm_state_afinfo. Signed-off-by: Miika Komu <miika@iki.fi> Signed-off-by: Diego Beltrami <Diego.Beltrami@hiit.fi> Signed-off-by: Kazunori Miyazawa <miyazawa@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/xfrm4_state.c1
-rw-r--r--net/ipv6/xfrm6_state.c1
-rw-r--r--net/xfrm/xfrm_state.c10
3 files changed, 7 insertions, 5 deletions
diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
index 3cc3df0c6ece..93e2c061cdda 100644
--- a/net/ipv4/xfrm4_state.c
+++ b/net/ipv4/xfrm4_state.c
@@ -51,6 +51,7 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = {
51 .family = AF_INET, 51 .family = AF_INET,
52 .init_flags = xfrm4_init_flags, 52 .init_flags = xfrm4_init_flags,
53 .init_tempsel = __xfrm4_init_tempsel, 53 .init_tempsel = __xfrm4_init_tempsel,
54 .output = xfrm4_output,
54}; 55};
55 56
56void __init xfrm4_state_init(void) 57void __init xfrm4_state_init(void)
diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index 9ddaa9d41539..60ad5f074e0a 100644
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -171,6 +171,7 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = {
171 .init_tempsel = __xfrm6_init_tempsel, 171 .init_tempsel = __xfrm6_init_tempsel,
172 .tmpl_sort = __xfrm6_tmpl_sort, 172 .tmpl_sort = __xfrm6_tmpl_sort,
173 .state_sort = __xfrm6_state_sort, 173 .state_sort = __xfrm6_state_sort,
174 .output = xfrm6_output,
174}; 175};
175 176
176void __init xfrm6_state_init(void) 177void __init xfrm6_state_init(void)
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index fdb08d9f34aa..24f7bfd07af2 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -183,9 +183,6 @@ static DEFINE_SPINLOCK(xfrm_state_gc_lock);
183 183
184int __xfrm_state_delete(struct xfrm_state *x); 184int __xfrm_state_delete(struct xfrm_state *x);
185 185
186static struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned short family);
187static void xfrm_state_put_afinfo(struct xfrm_state_afinfo *afinfo);
188
189int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol); 186int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol);
190void km_state_expired(struct xfrm_state *x, int hard, u32 pid); 187void km_state_expired(struct xfrm_state *x, int hard, u32 pid);
191 188
@@ -1458,7 +1455,7 @@ int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo)
1458} 1455}
1459EXPORT_SYMBOL(xfrm_state_unregister_afinfo); 1456EXPORT_SYMBOL(xfrm_state_unregister_afinfo);
1460 1457
1461static struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned short family) 1458struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned short family)
1462{ 1459{
1463 struct xfrm_state_afinfo *afinfo; 1460 struct xfrm_state_afinfo *afinfo;
1464 if (unlikely(family >= NPROTO)) 1461 if (unlikely(family >= NPROTO))
@@ -1470,11 +1467,14 @@ static struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned short family)
1470 return afinfo; 1467 return afinfo;
1471} 1468}
1472 1469
1473static void xfrm_state_put_afinfo(struct xfrm_state_afinfo *afinfo) 1470void xfrm_state_put_afinfo(struct xfrm_state_afinfo *afinfo)
1474{ 1471{
1475 read_unlock(&xfrm_state_afinfo_lock); 1472 read_unlock(&xfrm_state_afinfo_lock);
1476} 1473}
1477 1474
1475EXPORT_SYMBOL(xfrm_state_get_afinfo);
1476EXPORT_SYMBOL(xfrm_state_put_afinfo);
1477
1478/* Temporarily located here until net/xfrm/xfrm_tunnel.c is created */ 1478/* Temporarily located here until net/xfrm/xfrm_tunnel.c is created */
1479void xfrm_state_delete_tunnel(struct xfrm_state *x) 1479void xfrm_state_delete_tunnel(struct xfrm_state *x)
1480{ 1480{