diff options
| author | Benjamin Zores <benjamin.zores@alcatel-lucent.fr> | 2009-01-29 16:19:13 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-17 09:28:54 -0800 |
| commit | a027928cd7b8a16bdbfb3fc42f3eecf469d3249b (patch) | |
| tree | d908c3d8bf4b802544126a5fdbc8815a3a7eb2d2 /net/ipv4 | |
| parent | c572a7072873729d308f034e1e1017780f0c48b3 (diff) | |
ipv4: fix infinite retry loop in IP-Config
[ Upstream commit 9d8dba6c979fa99c96938c869611b9a23b73efa9 ]
Signed-off-by: Benjamin Zores <benjamin.zores@alcatel-lucent.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ipconfig.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 42065fff46c4..ff75000aa231 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -1272,6 +1272,9 @@ __be32 __init root_nfs_parse_addr(char *name) static int __init ip_auto_config(void) { __be32 addr; +#ifdef IPCONFIG_DYNAMIC + int retries = CONF_OPEN_RETRIES; +#endif #ifdef CONFIG_PROC_FS proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops); @@ -1308,9 +1311,6 @@ static int __init ip_auto_config(void) #endif ic_first_dev->next) { #ifdef IPCONFIG_DYNAMIC - - int retries = CONF_OPEN_RETRIES; - if (ic_dynamic() < 0) { ic_close_devs(); |