Commit cd7816d1 authored by Gerlando Falauto's avatar Gerlando Falauto Committed by David S. Miller

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: default avatarGerlando Falauto <gerlando.falauto@keymile.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a76c0adf
...@@ -253,6 +253,10 @@ static int __init ic_open_devs(void) ...@@ -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 */ /* wait for a carrier on at least one device */
start = jiffies; start = jiffies;
while (jiffies - start < msecs_to_jiffies(CONF_CARRIER_TIMEOUT)) { while (jiffies - start < msecs_to_jiffies(CONF_CARRIER_TIMEOUT)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment