From patchwork Tue Oct 5 06:17:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 66754 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 957C3B6EEE for ; Tue, 5 Oct 2010 17:18:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757513Ab0JEGR7 (ORCPT ); Tue, 5 Oct 2010 02:17:59 -0400 Received: from mail.vyatta.com ([76.74.103.46]:47810 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753967Ab0JEGR6 (ORCPT ); Tue, 5 Oct 2010 02:17:58 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id 5E26A1829017; Mon, 4 Oct 2010 23:11:12 -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 Mn1R1o6owdO5; Mon, 4 Oct 2010 23:11:11 -0700 (PDT) Received: from s6510 (p26041-ipngn201yosida.nagano.ocn.ne.jp [180.3.95.41]) by mail.vyatta.com (Postfix) with ESMTPSA id E0E661829009; Mon, 4 Oct 2010 23:11:10 -0700 (PDT) Date: Tue, 5 Oct 2010 15:17:53 +0900 From: Stephen Hemminger To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH net-next] ipv6: make __ipv6_isatap_ifid static Message-ID: <20101005151753.363121b8@s6510> Organization: Vyatta X-Mailer: Claws Mail 3.7.5 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Another exported symbol only used in one file Signed-off-by: Stephen Hemminger Acked-by: Eric Dumazet --- include/net/addrconf.h | 2 -- net/ipv6/addrconf.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) -- 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/addrconf.h 2010-10-02 09:04:22.700929104 +0900 +++ b/include/net/addrconf.h 2010-10-02 09:11:00.651004530 +0900 @@ -276,8 +276,6 @@ static inline int ipv6_addr_is_ll_all_ro (addr->s6_addr32[3] ^ htonl(0x00000002))) == 0; } -extern int __ipv6_isatap_ifid(u8 *eui, __be32 addr); - static inline int ipv6_addr_is_isatap(const struct in6_addr *addr) { return (addr->s6_addr32[2] | htonl(0x02000000)) == htonl(0x02005EFE); --- a/net/ipv6/addrconf.c 2010-10-02 09:04:22.720901336 +0900 +++ b/net/ipv6/addrconf.c 2010-10-02 09:05:09.031021195 +0900 @@ -1544,7 +1544,7 @@ static int addrconf_ifid_infiniband(u8 * return 0; } -int __ipv6_isatap_ifid(u8 *eui, __be32 addr) +static int __ipv6_isatap_ifid(u8 *eui, __be32 addr) { if (addr == 0) return -1; @@ -1560,7 +1560,6 @@ int __ipv6_isatap_ifid(u8 *eui, __be32 a memcpy(eui + 4, &addr, 4); return 0; } -EXPORT_SYMBOL(__ipv6_isatap_ifid); static int addrconf_ifid_sit(u8 *eui, struct net_device *dev) {