Commit 9d8dba6c979fa99c96938c869611b9a23b73efa9

Authored by Benjamin Zores
Committed by David S. Miller
1 parent 58092d1e0a

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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

... ... @@ -1268,6 +1268,9 @@
1268 1268 static int __init ip_auto_config(void)
1269 1269 {
1270 1270 __be32 addr;
  1271 +#ifdef IPCONFIG_DYNAMIC
  1272 + int retries = CONF_OPEN_RETRIES;
  1273 +#endif
1271 1274  
1272 1275 #ifdef CONFIG_PROC_FS
1273 1276 proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops);
... ... @@ -1304,9 +1307,6 @@
1304 1307 #endif
1305 1308 ic_first_dev->next) {
1306 1309 #ifdef IPCONFIG_DYNAMIC
1307   -
1308   - int retries = CONF_OPEN_RETRIES;
1309   -
1310 1310 if (ic_dynamic() < 0) {
1311 1311 ic_close_devs();
1312 1312