Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: ipconfig: move ic_nameservers_fallback into #ifdef block

Browse Source 
The new variable is only used when IPCONFIG_BOOTP is defined and otherwise
causes a warning:

net/ipv4/ipconfig.c:177:12: error: 'ic_nameservers_fallback' defined but not used [-Werror=unused-variable]

Move it next to the user.

Fixes: 81ac2722fa ("net: ipconfig: Allow DNS to be overwritten by DHCPACK")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnd Bergmann 2023-05-19 11:32:38 +02:00 committed by David S. Miller
parent 2ae9c66b04
commit dbb99d7852
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/ipconfig.c
View File

@ -173,9 +173,6 @@ static int ic_proto_have_if __initdata;
/* MTU for boot device */ /* MTU for boot device */
static int ic_dev_mtu __initdata; static int ic_dev_mtu __initdata;
/* DHCPACK can overwrite DNS if fallback was set upon first BOOTP reply */
static int ic_nameservers_fallback __initdata;
#ifdef IPCONFIG_DYNAMIC #ifdef IPCONFIG_DYNAMIC
static DEFINE_SPINLOCK(ic_recv_lock); static DEFINE_SPINLOCK(ic_recv_lock);
static volatile int ic_got_reply __initdata; /* Proto(s) that replied */ static volatile int ic_got_reply __initdata; /* Proto(s) that replied */
@ -668,6 +665,9 @@ static struct packet_type bootp_packet_type __initdata = {
.func = ic_bootp_recv, .func = ic_bootp_recv,
}; };
/* DHCPACK can overwrite DNS if fallback was set upon first BOOTP reply */
static int ic_nameservers_fallback __initdata;
/* /*
* Initialize DHCP/BOOTP extension fields in the request. * Initialize DHCP/BOOTP extension fields in the request.
*/ */