---

yaml --- r: 276963 b: refs/heads/master c: cd7816d h: refs/heads/master i: 276961: 8ae9c17 276959: 1281ed2 v: v3
git-mirror · Dec 20, 2011 · f0f4019 · f0f4019
1 parent f4bb5b7
commit f0f4019
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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)) {