Commit 9d8dba6c authored by Benjamin Zores's avatar Benjamin Zores Committed by David S. Miller

ipv4: fix infinite retry loop in IP-Config

Signed-off-by: default avatarBenjamin Zores <benjamin.zores@alcatel-lucent.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 58092d1e
...@@ -1268,6 +1268,9 @@ __be32 __init root_nfs_parse_addr(char *name) ...@@ -1268,6 +1268,9 @@ __be32 __init root_nfs_parse_addr(char *name)
static int __init ip_auto_config(void) static int __init ip_auto_config(void)
{ {
__be32 addr; __be32 addr;
#ifdef IPCONFIG_DYNAMIC
int retries = CONF_OPEN_RETRIES;
#endif
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops); proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops);
...@@ -1304,9 +1307,6 @@ static int __init ip_auto_config(void) ...@@ -1304,9 +1307,6 @@ static int __init ip_auto_config(void)
#endif #endif
ic_first_dev->next) { ic_first_dev->next) {
#ifdef IPCONFIG_DYNAMIC #ifdef IPCONFIG_DYNAMIC
int retries = CONF_OPEN_RETRIES;
if (ic_dynamic() < 0) { if (ic_dynamic() < 0) {
ic_close_devs(); ic_close_devs();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment