aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/xfrm.h2
-rw-r--r--net/xfrm/xfrm_policy.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 36fdcb3fab9e..f28d7c9b9f8d 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1465,8 +1465,6 @@ struct xfrm_state *xfrm_find_acq(struct net *net, struct xfrm_mark *mark,
1465 xfrm_address_t *saddr, int create, 1465 xfrm_address_t *saddr, int create,
1466 unsigned short family); 1466 unsigned short family);
1467extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol); 1467extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
1468extern int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *xdst,
1469 struct flowi *fl, int family, int strict);
1470 1468
1471#ifdef CONFIG_XFRM_MIGRATE 1469#ifdef CONFIG_XFRM_MIGRATE
1472extern int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type, 1470extern int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index cbab6e1a8c9c..044e77898512 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -50,6 +50,9 @@ static struct xfrm_policy_afinfo *xfrm_policy_get_afinfo(unsigned short family);
50static void xfrm_policy_put_afinfo(struct xfrm_policy_afinfo *afinfo); 50static void xfrm_policy_put_afinfo(struct xfrm_policy_afinfo *afinfo);
51static void xfrm_init_pmtu(struct dst_entry *dst); 51static void xfrm_init_pmtu(struct dst_entry *dst);
52static int stale_bundle(struct dst_entry *dst); 52static int stale_bundle(struct dst_entry *dst);
53static int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *xdst,
54 struct flowi *fl, int family, int strict);
55
53 56
54static struct xfrm_policy *__xfrm_policy_unlink(struct xfrm_policy *pol, 57static struct xfrm_policy *__xfrm_policy_unlink(struct xfrm_policy *pol,
55 int dir); 58 int dir);
@@ -2276,7 +2279,7 @@ static void xfrm_init_pmtu(struct dst_entry *dst)
2276 * still valid. 2279 * still valid.
2277 */ 2280 */
2278 2281
2279int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first, 2282static int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,
2280 struct flowi *fl, int family, int strict) 2283 struct flowi *fl, int family, int strict)
2281{ 2284{
2282 struct dst_entry *dst = &first->u.dst; 2285 struct dst_entry *dst = &first->u.dst;
@@ -2358,8 +2361,6 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,
2358 return 1; 2361 return 1;
2359} 2362}
2360 2363
2361EXPORT_SYMBOL(xfrm_bundle_ok);
2362
2363int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) 2364int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
2364{ 2365{
2365 struct net *net; 2366 struct net *net;