[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    [IPV4] Fix ip=dhcp regression
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2007-12-30 9:59:02
Message-ID: 200712300959.lBU9x2ml000839 () hera ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9cecd07c3f7a818a5865daad8cb5be408508dc99
Commit:     9cecd07c3f7a818a5865daad8cb5be408508dc99
Parent:     1842c7f260dd24dad2dd8eded80904d7a6c5525f
Author:     Simon Horman <horms@verge.net.au>
AuthorDate: Thu Dec 27 21:19:10 2007 -0800
Committer:  David S. Miller <davem@davemloft.net>
CommitDate: Fri Dec 28 13:39:11 2007 -0800

    [IPV4] Fix ip=dhcp regression
    
    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>
---
 net/ipv4/ipconfig.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 420f56a..56a6757 100644
--- a/net/ipv4/ipconfig.c
+++ b/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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]