path: root/net
diff options
authorGerlando Falauto <>2011-12-19 22:58:04 +0000
committerRohan Somvanshi <>2012-01-11 10:23:05 -0800
commitf41f227f30f910b784c0d58d039c459c268c5ec5 (patch)
tree5b4fd1c424fc81efcbbc874d95bdef185883aaec /net
parentd9e062cc32ae75bd4656fc5232cb477ae0edf7fe (diff)
net: have ipconfig not wait if no dev is available
[ Upstream commit cd7816d14953c8af910af5bb92f488b0b277e29d ] previous commit 3fb72f1e6e6165c5f495e8dc11c5bbd14c73385c makes IP-Config wait for carrier on at least one network device. Before waiting (predefined value 120s), check that at least one device was successfully brought up. Otherwise (e.g. buggy bootloader which does not set the MAC address) there is no point in waiting for carrier. Cc: Micha Nelissen <> Cc: Holger Brunck <> Signed-off-by: Gerlando Falauto <> Signed-off-by: David S. Miller <> Signed-off-by: Greg Kroah-Hartman <> Change-Id: I77fe0b97b750a3064e67330b131811edeebbc29b Reviewed-on: http://git-master/r/74217 Reviewed-by: Varun Wadekar <> Tested-by: Varun Wadekar <>
Diffstat (limited to 'net')
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 472a8c4f1dc0..004bb74b41c2 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -252,6 +252,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)) {