| From 03afe37189895abbe71c57047bc55833f1e0b04b Mon Sep 17 00:00:00 2001 |
| From: Benjamin Zores <benjamin.zores@alcatel-lucent.fr> |
| Date: Thu, 29 Jan 2009 16:19:13 -0800 |
| Subject: ipv4: fix infinite retry loop in IP-Config |
| |
| From: Benjamin Zores <benjamin.zores@alcatel-lucent.fr> |
| |
| [ 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> |
| |
| --- |
| net/ipv4/ipconfig.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/net/ipv4/ipconfig.c |
| +++ b/net/ipv4/ipconfig.c |
| @@ -1272,6 +1272,9 @@ __be32 __init root_nfs_parse_addr(char * |
| 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(); |
| |
