Commit cd7816d1 authored Dec 19, 2011 by Gerlando Falauto Committed by David S. Miller Dec 20, 2011

net: have ipconfig not wait if no dev is available



previous commit 3fb72f1e
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 <micha@neli.hopto.org>
Cc: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a76c0adf

net/ipv4/ipconfig.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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)) {

Admin message