Patchwork [net-next] xfrm: make xfrm_bundle_ok local

login
register
mail settings
Submitter stephen hemminger
Date Oct. 15, 2010, 3:14 p.m.
Message ID <20101015081419.79252990@nehalam>
Download mbox | patch
Permalink /patch/67969/
State Accepted
Delegated to: David Miller
Headers show

Comments

stephen hemminger - Oct. 15, 2010, 3:14 p.m.
Only used in one place.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Oct. 21, 2010, 10:15 a.m.
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 15 Oct 2010 08:14:19 -0700

> Only used in one place.
> 
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/include/net/xfrm.h	2010-10-05 23:27:43.971148720 +0900
+++ b/include/net/xfrm.h	2010-10-05 23:27:54.631127801 +0900
@@ -1466,8 +1466,6 @@  struct xfrm_state *xfrm_find_acq(struct 
 				 xfrm_address_t *saddr, int create,
 				 unsigned short family);
 extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
-extern int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *xdst,
-			  struct flowi *fl, int family, int strict);
 
 #ifdef CONFIG_XFRM_MIGRATE
 extern int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
--- a/net/xfrm/xfrm_policy.c	2010-10-05 23:27:43.995125930 +0900
+++ b/net/xfrm/xfrm_policy.c	2010-10-05 23:28:27.244135115 +0900
@@ -50,6 +50,9 @@  static struct xfrm_policy_afinfo *xfrm_p
 static void xfrm_policy_put_afinfo(struct xfrm_policy_afinfo *afinfo);
 static void xfrm_init_pmtu(struct dst_entry *dst);
 static int stale_bundle(struct dst_entry *dst);
+static int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *xdst,
+			  struct flowi *fl, int family, int strict);
+
 
 static struct xfrm_policy *__xfrm_policy_unlink(struct xfrm_policy *pol,
 						int dir);
@@ -2276,7 +2279,7 @@  static void xfrm_init_pmtu(struct dst_en
  * still valid.
  */
 
-int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,
+static int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,
 		struct flowi *fl, int family, int strict)
 {
 	struct dst_entry *dst = &first->u.dst;
@@ -2358,8 +2361,6 @@  int xfrm_bundle_ok(struct xfrm_policy *p
 	return 1;
 }
 
-EXPORT_SYMBOL(xfrm_bundle_ok);
-
 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
 {
 	struct net *net;