From patchwork Thu Oct 21 17:50:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 68733 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 380BBB6F11 for ; Fri, 22 Oct 2010 05:01:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756396Ab0JUSBG (ORCPT ); Thu, 21 Oct 2010 14:01:06 -0400 Received: from suva.vyatta.com ([76.74.103.44]:36297 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756147Ab0JUSBE (ORCPT ); Thu, 21 Oct 2010 14:01:04 -0400 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id o9LI137p006318; Thu, 21 Oct 2010 11:01:03 -0700 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id o9LI13j5006317; Thu, 21 Oct 2010 11:01:03 -0700 Message-Id: <20101021175148.504406585@vyatta.com> User-Agent: quilt/0.48-1 Date: Thu, 21 Oct 2010 10:50:51 -0700 From: Stephen Hemminger To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH 06/12] ipconfig: make local variables/function static References: <20101021175045.625707607@vyatta.com> Content-Disposition: inline; filename=ipconfig-local.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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/net/ipv4/ipconfig.c 2010-10-19 10:29:06.307382554 -0700 +++ b/net/ipv4/ipconfig.c 2010-10-19 10:32:05.564463819 -0700 @@ -112,12 +112,12 @@ * variables using firmware environment vars. If this is set, it will * ignore such firmware variables. */ -int ic_set_manually __initdata = 0; /* IPconfig parameters set manually */ +static int ic_set_manually __initdata = 0; /* IPconfig parameters set manually */ static int ic_enable __initdata = 0; /* IP config enabled? */ /* Protocol choice */ -int ic_proto_enabled __initdata = 0 +static int ic_proto_enabled __initdata = 0 #ifdef IPCONFIG_BOOTP | IC_BOOTP #endif @@ -131,16 +131,16 @@ int ic_proto_enabled __initdata = 0 static int ic_host_name_set __initdata = 0; /* Host name set by us? */ -__be32 ic_myaddr = NONE; /* My IP address */ +static __be32 ic_myaddr = NONE; /* My IP address */ static __be32 ic_netmask = NONE; /* Netmask for local subnet */ -__be32 ic_gateway = NONE; /* Gateway IP address */ +static __be32 ic_gateway = NONE; /* Gateway IP address */ -__be32 ic_servaddr = NONE; /* Boot server IP address */ +static __be32 ic_servaddr = NONE; /* Boot server IP address */ -__be32 root_server_addr = NONE; /* Address of NFS server */ -u8 root_server_path[256] = { 0, }; /* Path to mount as root */ +static __be32 root_server_addr = NONE; /* Address of NFS server */ +static u8 root_server_path[256] = { 0 }; /* Path to mount as root */ -u32 ic_dev_xid; /* Device under configuration */ +static u32 ic_dev_xid; /* Device under configuration */ /* vendor class identifier */ static char vendor_class_identifier[253] __initdata; @@ -1289,7 +1289,7 @@ static const struct file_operations pnp_ * need to have root_server_addr set _before_ IPConfig gets called as it * can override it. */ -__be32 __init root_nfs_parse_addr(char *name) +static __be32 __init root_nfs_parse_addr(char *name) { __be32 addr; int octets = 0;