From f0f4019a3356a345991f6963703803713df8ebd5 Mon Sep 17 00:00:00 2001
From: Gerlando Falauto <gerlando.falauto@keymile.com>
Date: Mon, 19 Dec 2011 22:58:04 +0000
Subject: [PATCH] --- yaml --- r: 276963 b: refs/heads/master c:
 cd7816d14953c8af910af5bb92f488b0b277e29d h: refs/heads/master i:   276961:
 8ae9c1770169e16f477d49fe77e54fd1a061953b   276959:
 1281ed2f9db254f612da585fd7580badd437c4d4 v: v3

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

diff --git a/[refs] b/[refs]
index 079eac07fd2f..5c79d20edba0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a76c0adf60f6ca5ff3481992e4ea0383776b24d2
+refs/heads/master: cd7816d14953c8af910af5bb92f488b0b277e29d
diff --git a/trunk/net/ipv4/ipconfig.c b/trunk/net/ipv4/ipconfig.c
index 0da2afc97f32..99ec116bef14 100644
--- a/trunk/net/ipv4/ipconfig.c
+++ b/trunk/net/ipv4/ipconfig.c
@@ -253,6 +253,10 @@ static int __init ic_open_devs(void)
 		}
 	}
 
+	/* no point in waiting if we could not bring up at least one device */
+	if (!ic_first_dev)
+		goto have_carrier;
+
 	/* wait for a carrier on at least one device */
 	start = jiffies;
 	while (jiffies - start < msecs_to_jiffies(CONF_CARRIER_TIMEOUT)) {