diff --git a/[refs] b/[refs] index f80c963884ff..daad4db666d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1842c7f260dd24dad2dd8eded80904d7a6c5525f +refs/heads/master: 9cecd07c3f7a818a5865daad8cb5be408508dc99 diff --git a/trunk/net/ipv4/ipconfig.c b/trunk/net/ipv4/ipconfig.c index 420f56ad59f8..56a675734ea5 100644 --- a/trunk/net/ipv4/ipconfig.c +++ b/trunk/net/ipv4/ipconfig.c @@ -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;