Skip to content

Commit

Permalink
[IPV4] Fix ip=dhcp regression
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Simon Horman authored and David S. Miller committed Dec 28, 2007
1 parent 1842c7f commit 9cecd07
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions net/ipv4/ipconfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9cecd07

Please sign in to comment.