From 9cecd07c3f7a818a5865daad8cb5be408508dc99 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 27 Dec 2007 21:19:10 -0800 Subject: [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 --- net/ipv4/ipconfig.c | 1 + 1 file changed, 1 insertion(+) (limited to 'net/ipv4/ipconfig.c') 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; -- cgit v1.2.3