Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 06:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipconfig: fix trivial build error

Browse Source 
The commit 5e953778a2 ("ipconfig: add nameserver
IPs to kernel-parameter ip=") introduces ic_nameservers_predef() that defined
only for BOOTP. However it is used by ip_auto_config_setup() as well. This
patch moves it outside of #ifdef BOOTP.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Christoph Fritz <chf.fritz@googlemail.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andy Shevchenko 2012-09-24 22:09:58 +00:00 committed by David S. Miller
parent 8489c1d9a8
commit 842b08bbee
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/ipv4/ipconfig.c
View File

@ -582,6 +582,17 @@ static void __init ic_rarp_send_if(struct ic_device *d)
}
#endif
/*
* Predefine Nameservers
*/
static inline void __init ic_nameservers_predef(void)
{
int i;
for (i = 0; i < CONF_NAMESERVERS_MAX; i++)
ic_nameservers[i] = NONE;
}
/*
* DHCP/BOOTP support.
*/
@ -742,17 +753,6 @@ static void __init ic_bootp_init_ext(u8 *e)
}
/*
* Predefine Nameservers
*/
static inline void __init ic_nameservers_predef(void)
{
int i;
for (i = 0; i < CONF_NAMESERVERS_MAX; i++)
ic_nameservers[i] = NONE;
}
/*
* Initialize the DHCP/BOOTP mechanism.
*/