From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: netdev@vger.kernel.org, linux-next@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Christoph Fritz <chf.fritz@googlemail.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH] ipconfig: fix trivial build error
Date: Tue, 25 Sep 2012 11:09:58 +0300 [thread overview]
Message-ID: <1348560598-21233-1-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1348255713.12456.43.camel@mars>
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
next prev parent reply other threads:[~2012-09-25 8:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 21:28 [PATCH] ipconfig: add nameserver IPs to kernel-parameter ip= Christoph Fritz
2012-09-20 21:37 ` David Miller
2012-09-20 21:48 ` [PATCH v2] " Christoph Fritz
2012-09-21 17:37 ` David Miller
2012-09-21 18:31 ` [PATCH v3] " Christoph Fritz
2012-09-21 18:51 ` David Miller
2012-09-21 19:28 ` Christoph Fritz
2012-09-25 8:09 ` Andy Shevchenko [this message]
2012-09-25 17:23 ` [PATCH] ipconfig: fix trivial build error David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348560598-21233-1-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=chf.fritz@googlemail.com \
--cc=davem@davemloft.net \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).