diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2012-09-24 18:09:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-25 13:22:30 -0400 |
commit | 842b08bbee448b2069aaebb7f18b40942ad2a1bd (patch) | |
tree | 86e639f70d101e0a299829d3fa324c20aa17e8ba /net/ipv4 | |
parent | 8489c1d9a80e6263fb71de5bc7f39773712cfa7e (diff) |
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 1c0e7e051044..798358b10717 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) | |||
583 | #endif | 583 | #endif |
584 | 584 | ||
585 | /* | 585 | /* |
586 | * Predefine Nameservers | ||
587 | */ | ||
588 | static inline void __init ic_nameservers_predef(void) | ||
589 | { | ||
590 | int i; | ||
591 | |||
592 | for (i = 0; i < CONF_NAMESERVERS_MAX; i++) | ||
593 | ic_nameservers[i] = NONE; | ||
594 | } | ||
595 | |||
596 | /* | ||
586 | * DHCP/BOOTP support. | 597 | * DHCP/BOOTP support. |
587 | */ | 598 | */ |
588 | 599 | ||
@@ -743,17 +754,6 @@ static void __init ic_bootp_init_ext(u8 *e) | |||
743 | 754 | ||
744 | 755 | ||
745 | /* | 756 | /* |
746 | * Predefine Nameservers | ||
747 | */ | ||
748 | static inline void __init ic_nameservers_predef(void) | ||
749 | { | ||
750 | int i; | ||
751 | |||
752 | for (i = 0; i < CONF_NAMESERVERS_MAX; i++) | ||
753 | ic_nameservers[i] = NONE; | ||
754 | } | ||
755 | |||
756 | /* | ||
757 | * Initialize the DHCP/BOOTP mechanism. | 757 | * Initialize the DHCP/BOOTP mechanism. |
758 | */ | 758 | */ |
759 | static inline void __init ic_bootp_init(void) | 759 | static inline void __init ic_bootp_init(void) |