Patchwork [net-next] xfrm6: make xfrm6_tunnel_free_spi local

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

Comments

stephen hemminger - Oct. 15, 2010, 3:15 p.m.
Function only defined and used in one file.

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:15:59 -0700

> Function only defined and used in one file.
> 
> 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:33:55.959118983 +0900
+++ b/include/net/xfrm.h	2010-10-05 23:34:05.079117188 +0900
@@ -1419,7 +1419,6 @@  extern int xfrm6_input_addr(struct sk_bu
 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);
--- a/net/ipv6/xfrm6_tunnel.c	2010-10-05 23:33:56.039118393 +0900
+++ b/net/ipv6/xfrm6_tunnel.c	2010-10-05 23:34:21.011117560 +0900
@@ -199,7 +199,7 @@  static void x6spi_destroy_rcu(struct rcu
 			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 *n
 	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));