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>
This commit is contained in:
parent
58092d1e0a
commit
9d8dba6c97
@ -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)
|
|||||||
#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();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user