From patchwork Fri Oct 15 15:15:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 67970 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 96B13B70E7 for ; Sat, 16 Oct 2010 02:16:07 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755792Ab0JOPQD (ORCPT ); Fri, 15 Oct 2010 11:16:03 -0400 Received: from mail.vyatta.com ([76.74.103.46]:43132 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754210Ab0JOPQB (ORCPT ); Fri, 15 Oct 2010 11:16:01 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id 660971828F53; Fri, 15 Oct 2010 08:16:01 -0700 (PDT) X-Virus-Scanned: amavisd-new at tahiti.vyatta.com Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iZoEH9TRNOy8; Fri, 15 Oct 2010 08:16:00 -0700 (PDT) Received: from nehalam (pool-74-107-135-205.ptldor.fios.verizon.net [74.107.135.205]) by mail.vyatta.com (Postfix) with ESMTPSA id 88E6D1828F3F; Fri, 15 Oct 2010 08:16:00 -0700 (PDT) Date: Fri, 15 Oct 2010 08:15:59 -0700 From: Stephen Hemminger To: David Miller , Herbert Xu , YOSHIFUJI Hideaki Cc: netdev@vger.kernel.org Subject: [PATCH net-next] xfrm6: make xfrm6_tunnel_free_spi local Message-ID: <20101015081559.6ede35a0@nehalam> Organization: Vyatta X-Mailer: Claws Mail 3.7.6 (GTK+ 2.22.0; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Function only defined and used in one file. Signed-off-by: Stephen Hemminger --- 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 --- 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));