diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
| commit | 2702e0a46c2d28da92b32c9b068ee1291fc0de35 (patch) | |
| tree | c1e9868a4b91beeebd5f4e820588bc2ae8371911 /net/ipv4/ipconfig.c | |
| parent | 42bb8cc5e81028e217105299001070d57eb84ad7 (diff) | |
| parent | adfafefd104d840ee4461965f22624d77532675b (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -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(); |