Commit 842b08bb authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

ipconfig: fix trivial build error 



The commit 5e953778 ("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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Christoph Fritz <chf.fritz@googlemail.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8489c1d9

net/ipv4/ipconfig.c

+11 −11
Original line number Diff line number Diff line
@@ -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.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE