* [PATCH] ipconfig: fix trivial build error
[not found] <1348255713.12456.43.camel@mars>
@ 2012-09-25 8:09 ` Andy Shevchenko
2012-09-25 17:23 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2012-09-25 8:09 UTC (permalink / raw)
To: netdev, linux-next; +Cc: Andy Shevchenko, Christoph Fritz, David S. Miller
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>
---
net/ipv4/ipconfig.c | 22 +++++++++++-----------
1 file 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)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ipconfig: fix trivial build error
2012-09-25 8:09 ` [PATCH] ipconfig: fix trivial build error Andy Shevchenko
@ 2012-09-25 17:23 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-09-25 17:23 UTC (permalink / raw)
To: andriy.shevchenko; +Cc: netdev, linux-next, chf.fritz
From: Andy Shevchenko <andriy.shevchenko@linux•intel.com>
Date: Tue, 25 Sep 2012 11:09:58 +0300
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-25 17:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1348255713.12456.43.camel@mars>
2012-09-25 8:09 ` [PATCH] ipconfig: fix trivial build error Andy Shevchenko
2012-09-25 17:23 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox