leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IPV4] Fix ip=dhcp regression

Browse Source 
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 <horms@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Simon Horman 2007-12-27 21:19:10 -08:00 committed by David S. Miller
parent 1842c7f260
commit 9cecd07c3f
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/ipv4/ipconfig.c
View File

@ -1440,6 +1440,7 @@ static int __init ip_auto_config_setup(char *addrs)
int num = 0; int num = 0;
ic_set_manually = 1; ic_set_manually = 1;
ic_enable = 1;
if (ic_proto_name(addrs)) if (ic_proto_name(addrs))
return 1; return 1;