diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2012-09-24 22:09:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-25 13:22:30 -0400 |
| commit | 842b08bbee448b2069aaebb7f18b40942ad2a1bd (patch) | |
| tree | 86e639f70d101e0a299829d3fa324c20aa17e8ba /net/ipv4 | |
| parent | 8489c1d9a80e6263fb71de5bc7f39773712cfa7e (diff) | |
| download | op-kernel-dev-842b08bbee448b2069aaebb7f18b40942ad2a1bd.zip op-kernel-dev-842b08bbee448b2069aaebb7f18b40942ad2a1bd.tar.gz | |
ipconfig: fix trivial build error
The commit 5e953778a2aab04929a5e7b69f53dc26e39b079e ("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>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ipconfig.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 1c0e7e0..798358b 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -583,6 +583,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. */ @@ -743,17 +754,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. */ static inline void __init ic_bootp_init(void) |
