ipconfig: fix trivial build error
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 24 Sep 2012 22:09:58 +0000 (22:09 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Sep 2012 17:22:30 +0000 (13:22 -0400)
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>
net/ipv4/ipconfig.c

index 1c0e7e051044fe39f99cee7f248d62ccd27f2c21..798358b107171664823de1b13cc3ffd020dc7f94 100644 (file)
@@ -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.
  */
@@ -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.
  */