projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[IPV4] Fix ip=dhcp regression
[deliverable/linux.git]
/
net
/
ipv4
/
ipconfig.c
diff --git
a/net/ipv4/ipconfig.c
b/net/ipv4/ipconfig.c
index 96400b0bd08a9bca5237f5c9938143ec697cdb51..56a675734ea555ba256576a33f39cccd4c60cf91 100644
(file)
--- 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, "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;
#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;
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;
if (ic_proto_name(addrs))
return 1;
This page took
0.027922 seconds
and
5
git commands to generate.