diff options
author | stephen hemminger <shemminger@vyatta.com> | 2010-10-15 01:15:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-21 06:09:45 -0400 |
commit | 6f747aca5e61778190d1e27bdc469f49149f0230 (patch) | |
tree | 127de8b153a05437add3b959f10eea831466781e | |
parent | 191cc6877408348e90f4adb64726b60a93246b8b (diff) |
xfrm6: make xfrm6_tunnel_free_spi local
Function only defined and used in one file.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/xfrm.h | 1 | ||||
-rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 4f53532d4c2f..36fdcb3fab9e 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -1419,7 +1419,6 @@ extern int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr, | |||
1419 | extern int xfrm6_tunnel_register(struct xfrm6_tunnel *handler, unsigned short family); | 1419 | extern int xfrm6_tunnel_register(struct xfrm6_tunnel *handler, unsigned short family); |
1420 | extern int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family); | 1420 | extern int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family); |
1421 | extern __be32 xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr); | 1421 | extern __be32 xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr); |
1422 | extern void xfrm6_tunnel_free_spi(struct net *net, xfrm_address_t *saddr); | ||
1423 | extern __be32 xfrm6_tunnel_spi_lookup(struct net *net, xfrm_address_t *saddr); | 1422 | extern __be32 xfrm6_tunnel_spi_lookup(struct net *net, xfrm_address_t *saddr); |
1424 | extern int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb); | 1423 | extern int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb); |
1425 | extern int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb); | 1424 | extern int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb); |
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index ac7584b946a5..2969cad408de 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
@@ -199,7 +199,7 @@ static void x6spi_destroy_rcu(struct rcu_head *head) | |||
199 | container_of(head, struct xfrm6_tunnel_spi, rcu_head)); | 199 | container_of(head, struct xfrm6_tunnel_spi, rcu_head)); |
200 | } | 200 | } |
201 | 201 | ||
202 | void xfrm6_tunnel_free_spi(struct net *net, xfrm_address_t *saddr) | 202 | static void xfrm6_tunnel_free_spi(struct net *net, xfrm_address_t *saddr) |
203 | { | 203 | { |
204 | struct xfrm6_tunnel_net *xfrm6_tn = xfrm6_tunnel_pernet(net); | 204 | struct xfrm6_tunnel_net *xfrm6_tn = xfrm6_tunnel_pernet(net); |
205 | struct xfrm6_tunnel_spi *x6spi; | 205 | struct xfrm6_tunnel_spi *x6spi; |
@@ -223,8 +223,6 @@ void xfrm6_tunnel_free_spi(struct net *net, xfrm_address_t *saddr) | |||
223 | spin_unlock_bh(&xfrm6_tunnel_spi_lock); | 223 | spin_unlock_bh(&xfrm6_tunnel_spi_lock); |
224 | } | 224 | } |
225 | 225 | ||
226 | EXPORT_SYMBOL(xfrm6_tunnel_free_spi); | ||
227 | |||
228 | static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) | 226 | static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) |
229 | { | 227 | { |
230 | skb_push(skb, -skb_network_offset(skb)); | 228 | skb_push(skb, -skb_network_offset(skb)); |