OSDN Git Service

ipv4: ipconfig: avoid unused ic_proto_used symbol
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 Jan 2016 16:39:24 +0000 (17:39 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Feb 2018 10:03:47 +0000 (11:03 +0100)
commita2f1d9b7030bd388347fa0b77383ab6e06a44c63
tree9647a19abc68d9e1d3b9f351bdc3f98405693fde
parent88fb56455b1acd17cfd8d484e508fa4efe4794e7
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>
net/ipv4/ipconfig.c