diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-01-28 17:39:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-30 04:39:09 +0100 |
| commit | 52b79e2bdf92b07b37c805c50811eaf69a33683d (patch) | |
| tree | 7842331eee04f3c87eacb5b4628012e0d65f9519 /net/ipv4/ipconfig.c | |
| parent | Merge branch 'bnxt_en-fixes' (diff) | |
| download | linux-52b79e2bdf92b07b37c805c50811eaf69a33683d.tar.xz linux-52b79e2bdf92b07b37c805c50811eaf69a33683d.zip | |
ipv4: ipconfig: avoid unused ic_proto_used symbol
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>
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -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 67f7c9de0b16..2ed9dd2b5f2f 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -143,7 +143,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 */ |