Benjamin ZORES a écrit :

Jarek Poplawski a écrit :

quoted

On 28-01-2009 10:07, Benjamin ZORES wrote:
 

quoted

Hi,

The attached patch fixes some bug with ip-config max retry number.
In ip_auto_config(), kernel tries to retrieve IP configuration forever
in case of NFS root and some specific amount of time otherwise.

The problem is that, in case of error, the code jump to the 
try_try_again
goto statement, that reassigns the retry number counter, which 
obviously
leads to an infinite loop if IP config fails.

The attached patch corrects this behavior.
Hope one can push it to mainstream kernel tree.

Ben

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 42a0f3d..4911b81 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c

@@ -1268,6 +1268,7 @@ __be32 __init root_nfs_parse_addr(char *name)
 static int __init ip_auto_config(void)
 {
     __be32 addr;
+     int retries = CONF_OPEN_RETRIES;
    

 
Doesn't it need "#ifdef IPCONFIG_DYNAMIC" to prevent a compiler
warning? I guess you could add a "Signed-off-by:" line BTW.
  

You're perfectly right about this.
Attached an updated version of the patch.

Any chance of having it merged ?

Ben