Commit 6f747aca authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

xfrm6: make xfrm6_tunnel_free_spi local 



Function only defined and used in one file.

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

include/net/xfrm.h

+0 −1
Original line number Diff line number Diff line
@@ -1419,7 +1419,6 @@ extern int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr, 
extern int xfrm6_tunnel_register(struct xfrm6_tunnel *handler, unsigned short family);

extern int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family);

extern __be32 xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr);

extern void xfrm6_tunnel_free_spi(struct net *net, xfrm_address_t *saddr);

extern __be32 xfrm6_tunnel_spi_lookup(struct net *net, xfrm_address_t *saddr);

extern int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb);

extern int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb);

net/ipv6/xfrm6_tunnel.c

+1 −3
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static void x6spi_destroy_rcu(struct rcu_head *head) 
			container_of(head, struct xfrm6_tunnel_spi, rcu_head));

}



void xfrm6_tunnel_free_spi(struct net *net, xfrm_address_t *saddr)

static void xfrm6_tunnel_free_spi(struct net *net, xfrm_address_t *saddr)

{

	struct xfrm6_tunnel_net *xfrm6_tn = xfrm6_tunnel_pernet(net);

	struct xfrm6_tunnel_spi *x6spi;
@@ -223,8 +223,6 @@ void xfrm6_tunnel_free_spi(struct net *net, xfrm_address_t *saddr) 
	spin_unlock_bh(&xfrm6_tunnel_spi_lock);

}



EXPORT_SYMBOL(xfrm6_tunnel_free_spi);



static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)

{

	skb_push(skb, -skb_network_offset(skb));