From c9f92b8a7368ac495837f45d7da819c5961e96a9 Mon Sep 17 00:00:00 2001
From: Benjamin Zores <benjamin.zores@alcatel-lucent.fr>
Date: Thu, 29 Jan 2009 16:19:13 -0800
Subject: [PATCH] --- yaml --- r: 130495 b: refs/heads/master c:
 9d8dba6c979fa99c96938c869611b9a23b73efa9 h: refs/heads/master i:   130493:
 447cad745080541edebe571697aa3072d6d85f51   130491:
 a09c91220202e7057f6216b5f3b419d9a80da5d6   130487:
 339dfd6db8cb676eba522f5c1f206982a1005ebf   130479:
 51ff7a60e866646a7d5efb03ccd83b322365a97b   130463:
 bcd2f0eb7bdad538b98038aca7fea38db932686d   130431:
 bc30172cc285d183c904ba592b9ce3c4cfdf1c3d v: v3

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

diff --git a/[refs] b/[refs]
index 082235e44a90..b505f4f1e250 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58092d1e0a896eb1d9163d58f93df7ed704fa8e1
+refs/heads/master: 9d8dba6c979fa99c96938c869611b9a23b73efa9
diff --git a/trunk/net/ipv4/ipconfig.c b/trunk/net/ipv4/ipconfig.c
index 42a0f3dd3fd6..d722013c1cae 100644
--- a/trunk/net/ipv4/ipconfig.c
+++ b/trunk/net/ipv4/ipconfig.c
@@ -1268,6 +1268,9 @@ __be32 __init root_nfs_parse_addr(char *name)
 static int __init ip_auto_config(void)
 {
 	__be32 addr;
+#ifdef IPCONFIG_DYNAMIC
+	int retries = CONF_OPEN_RETRIES;
+#endif
 
 #ifdef CONFIG_PROC_FS
 	proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops);
@@ -1304,9 +1307,6 @@ static int __init ip_auto_config(void)
 #endif
 	    ic_first_dev->next) {
 #ifdef IPCONFIG_DYNAMIC
-
-		int retries = CONF_OPEN_RETRIES;
-
 		if (ic_dynamic() < 0) {
 			ic_close_devs();