Skip to content

Commit

Permalink
ipconfig: fix trivial build error
Browse files Browse the repository at this point in the history
The commit 5e95377 ("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>
  • Loading branch information
Andy Shevchenko authored and David S. Miller committed Sep 25, 2012
1 parent 8489c1d commit 842b08b
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions net/ipv4/ipconfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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.
*/
Expand Down

0 comments on commit 842b08b

Please sign in to comment.