aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2007-12-25 23:54:42 -0500
committerDavid S. Miller <davem@davemloft.net>2007-12-26 22:36:36 -0500
commita6c05c3d064dbb83be88cba3189beb5db9d2dfc3 (patch)
tree3520d14af7692de0e66525f94f62948f1dc759cf /net/ipv4
parentecef969e5b376f98b142e22deb1cec2f23e4f5d6 (diff)
[IPV4]: Fix ip command line processing.
Recently the documentation in Documentation/nfsroot.txt was update to note that in fact ip=off and ip=::::::off as the latter is ignored and the default (on) is used. This was certainly a step in the direction of reducing confusion. But it seems to me that the code ought to be fixed up so that ip=::::::off actually turns off ip autoconfiguration. This patch also notes more specifically that ip=on (aka ip=::::::on) is the default. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ipconfig.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 96400b0bd08..420f56ad59f 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1403,6 +1403,10 @@ static int __init ic_proto_name(char *name)
1403 if (!strcmp(name, "on") || !strcmp(name, "any")) { 1403 if (!strcmp(name, "on") || !strcmp(name, "any")) {
1404 return 1; 1404 return 1;
1405 } 1405 }
1406 if (!strcmp(name, "off") || !strcmp(name, "none")) {
1407 ic_enable = 0;
1408 return 1;
1409 }
1406#ifdef CONFIG_IP_PNP_DHCP 1410#ifdef CONFIG_IP_PNP_DHCP
1407 else if (!strcmp(name, "dhcp")) { 1411 else if (!strcmp(name, "dhcp")) {
1408 ic_proto_enabled &= ~IC_RARP; 1412 ic_proto_enabled &= ~IC_RARP;
@@ -1437,12 +1441,6 @@ static int __init ip_auto_config_setup(char *addrs)
1437 1441
1438 ic_set_manually = 1; 1442 ic_set_manually = 1;
1439 1443
1440 ic_enable = (*addrs &&
1441 (strcmp(addrs, "off") != 0) &&
1442 (strcmp(addrs, "none") != 0));
1443 if (!ic_enable)
1444 return 1;
1445
1446 if (ic_proto_name(addrs)) 1444 if (ic_proto_name(addrs))
1447 return 1; 1445 return 1;
1448 1446