diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-01-28 17:39:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-25 11:03:47 +0100 |
| commit | a2f1d9b7030bd388347fa0b77383ab6e06a44c63 (patch) | |
| tree | 9647a19abc68d9e1d3b9f351bdc3f98405693fde /net | |
| parent | 88fb56455b1acd17cfd8d484e508fa4efe4794e7 (diff) | |
| download | linux-stable-a2f1d9b7030bd388347fa0b77383ab6e06a44c63.tar.gz linux-stable-a2f1d9b7030bd388347fa0b77383ab6e06a44c63.tar.bz2 linux-stable-a2f1d9b7030bd388347fa0b77383ab6e06a44c63.zip | |
ipv4: ipconfig: avoid unused ic_proto_used symbol
commit 52b79e2bdf92b07b37c805c50811eaf69a33683d upstream.
When CONFIG_PROC_FS, CONFIG_IP_PNP_BOOTP, CONFIG_IP_PNP_DHCP and
CONFIG_IP_PNP_RARP are all disabled, we get a warning about the
ic_proto_used variable being unused:
net/ipv4/ipconfig.c:146:12: error: 'ic_proto_used' defined but not used [-Werror=unused-variable]
This avoids the warning, by making the definition conditional on
whether a dynamic IP configuration protocol is configured. If not,
we know that the value is always zero, so we can optimize away the
variable and all code that depends on it.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ipconfig.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 0bc7412d9e14..9d6b9c4c5f82 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -152,7 +152,11 @@ static char dhcp_client_identifier[253] __initdata; /* Persistent data: */ +#ifdef IPCONFIG_DYNAMIC static int ic_proto_used; /* Protocol used, if any */ +#else +#define ic_proto_used 0 +#endif static __be32 ic_nameservers[CONF_NAMESERVERS_MAX]; /* DNS Server IP addresses */ static u8 ic_domain[64]; /* DNS (not NIS) domain name */ |