Commit 1c4c40c4 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

xfrm: make xfrm_bundle_ok local 



Only used in one place.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d8a0b1c

include/net/xfrm.h

+0 −2
Original line number Diff line number Diff line
@@ -1465,8 +1465,6 @@ struct xfrm_state *xfrm_find_acq(struct net *net, struct xfrm_mark *mark, 
				 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,

net/xfrm/xfrm_policy.c

+4 −3
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ static struct xfrm_policy_afinfo *xfrm_policy_get_afinfo(unsigned short family); 
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_entry *dst) 
 * 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 *pol, struct xfrm_dst *first, 
	return 1;

}



EXPORT_SYMBOL(xfrm_bundle_ok);



int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)

{

	struct net *net;