diff options
| author | Benjamin Zores <benjamin.zores@alcatel-lucent.fr> | 2009-01-29 16:19:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-29 16:19:13 -0800 |
| commit | 9d8dba6c979fa99c96938c869611b9a23b73efa9 (patch) | |
| tree | e88cf71976d736f2158da6dfa66d152126f4ca7e /net | |
| parent | 58092d1e0a896eb1d9163d58f93df7ed704fa8e1 (diff) | |
| download | linux-3.10-9d8dba6c979fa99c96938c869611b9a23b73efa9.tar.gz linux-3.10-9d8dba6c979fa99c96938c869611b9a23b73efa9.tar.bz2 linux-3.10-9d8dba6c979fa99c96938c869611b9a23b73efa9.zip | |
ipv4: fix infinite retry loop in IP-Config
Signed-off-by: Benjamin Zores <benjamin.zores@alcatel-lucent.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -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 42a0f3dd3fd..d722013c1ca 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -1268,6 +1268,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); @@ -1304,9 +1307,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(); |