From fba22158dcb5710f1591f05ef56f58912029cfb2 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Mon, 24 Sep 2012 22:09:58 +0000
Subject: [PATCH] --- yaml --- r: 328099 b: refs/heads/master c:
 842b08bbee448b2069aaebb7f18b40942ad2a1bd h: refs/heads/master i:   328097:
 f60b286d9a4ac523e8717cd0998592469f5150f2   328095:
 8a16a488855f17cebb3a911689bb093b6e0f9e22 v: v3

---
 [refs]                    |  2 +-
 trunk/net/ipv4/ipconfig.c | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 301d22b8faa6..5aeee8889404 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8489c1d9a80e6263fb71de5bc7f39773712cfa7e
+refs/heads/master: 842b08bbee448b2069aaebb7f18b40942ad2a1bd
diff --git a/trunk/net/ipv4/ipconfig.c b/trunk/net/ipv4/ipconfig.c
index 1c0e7e051044..798358b10717 100644
--- a/trunk/net/ipv4/ipconfig.c
+++ b/trunk/net/ipv4/ipconfig.c
@@ -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.
  */