From: Simon Horman Date: Fri, 28 Dec 2007 05:19:10 +0000 (-0800) Subject: [IPV4] Fix ip=dhcp regression X-Git-Tag: v2.6.24-rc7~28 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9cecd07c3f7a818a5865daad8cb5be408508dc99;p=~emulex%2Finfiniband.git [IPV4] Fix ip=dhcp regression David Brownell pointed out a regression in my recent "Fix ip command line processing" patch. It turns out to be a fairly blatant oversight on my part whereby ic_enable is never set, and thus autoconfiguration is never enabled. Clearly my testing was broken :-( The solution that I have is to set ic_enable to 1 if we hit ip_auto_config_setup(), which basically means that autoconfiguration is activated unless told otherwise. I then flip ic_enable to 0 if ip=off, ip=none, ip=::::::off or ip=::::::none using ic_proto_name(); The incremental patch is below, let me know if a non-incremental version is prepared, as I did as for the original patch to be reverted pending a fix. Signed-off-by: Simon Horman Signed-off-by: David S. Miller --- diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 420f56ad59f..56a675734ea 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -1440,6 +1440,7 @@ static int __init ip_auto_config_setup(char *addrs) int num = 0; ic_set_manually = 1; + ic_enable = 1; if (ic_proto_name(addrs)) return 1;