X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=net%2Fipv4%2Fipconfig.c;h=56a675734ea555ba256576a33f39cccd4c60cf91;hb=9cecd07c3f7a818a5865daad8cb5be408508dc99;hp=96400b0bd08a9bca5237f5c9938143ec697cdb51;hpb=a12e60621b553e32711f9ad653aad3c92881c400;p=deliverable%2Flinux.git

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 96400b0bd08a..56a675734ea5 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1403,6 +1403,10 @@ static int __init ic_proto_name(char *name)
 	if (!strcmp(name, "on") || !strcmp(name, "any")) {
 		return 1;
 	}
+	if (!strcmp(name, "off") || !strcmp(name, "none")) {
+		ic_enable = 0;
+		return 1;
+	}
 #ifdef CONFIG_IP_PNP_DHCP
 	else if (!strcmp(name, "dhcp")) {
 		ic_proto_enabled &= ~IC_RARP;
@@ -1436,12 +1440,7 @@ static int __init ip_auto_config_setup(char *addrs)
 	int num = 0;
 
 	ic_set_manually = 1;
-
-	ic_enable = (*addrs &&
-		(strcmp(addrs, "off") != 0) &&
-		(strcmp(addrs, "none") != 0));
-	if (!ic_enable)
-		return 1;
+	ic_enable = 1;
 
 	if (ic_proto_name(addrs))
 		return 1;