git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
743c982
)
ipv4: fix infinite retry loop in IP-Config
author
Benjamin Zores
<benjamin.zores@alcatel-lucent.fr>
Fri, 30 Jan 2009 00:19:13 +0000
(16:19 -0800)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Tue, 17 Feb 2009 17:46:20 +0000
(09:46 -0800)
[ 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
patch
|
blob
|
history
diff --git
a/net/ipv4/ipconfig.c
b/net/ipv4/ipconfig.c
index
42065ff
..
ff75000
100644
(file)
--- a/
net/ipv4/ipconfig.c
+++ b/
net/ipv4/ipconfig.c
@@
-1272,6
+1272,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);
@@
-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();