| From 2ec3264c7298c2326f33c482e787ec449638ed85 Mon Sep 17 00:00:00 2001 |
| From: Gerlando Falauto <gerlando.falauto@keymile.com> |
| Date: Mon, 19 Dec 2011 22:58:04 +0000 |
| Subject: net: have ipconfig not wait if no dev is available |
| |
| |
| From: Gerlando Falauto <gerlando.falauto@keymile.com> |
| |
| [ 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 <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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| net/ipv4/ipconfig.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- 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)) { |
