Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=dcbdc93c6c64daf20622d6deae774d1e740efb8d
Commit:     dcbdc93c6c64daf20622d6deae774d1e740efb8d
Parent:     8aee929eda10b2502fd76c0bf2003f89f7992820
Author:     Joakim Tjernlund <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 10 15:14:54 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Aug 13 22:51:59 2007 -0700

    [IPCONFIG]: ip_auto_config fix
    
    The following commandline:
    
     root=/dev/mtdblock6 rw rootfstype=jffs2 
ip=192.168.1.10:::255.255.255.0:localhost.localdomain:eth1:off 
console=ttyS0,115200
    
    makes ip_auto_config fall back to DHCP and complain "IP-Config: Incomplete
    network configuration information." depending on if CONFIG_IP_PNP_DHCP is
    set or not.
    
    The only way I can make ip_auto_config accept my IP config is to add an
    entry for the server IP:
    
    ip=192.168.1.10:192.168.1.15::255.255.255.0:localhost.localdomain:eth1:off
    
    I think this is a bug since I am not using a NFS root FS.
    
    The following patch fixes the above problem.
    
    From: Andrew Morton <[EMAIL PROTECTED]>
    
    Davem said (in February!):
    
      Well, first of all the change in question is not in 2.4.x either.  I just
      checked the current 2.4.x GIT tree and the test is exactly:
    
        if (ic_myaddr == INADDR_NONE ||
    #ifdef CONFIG_ROOT_NFS
            (MAJOR(ROOT_DEV) == UNNAMED_MAJOR
             && root_server_addr == INADDR_NONE
             && ic_servaddr == INADDR_NONE) ||
    #endif
            ic_first_dev->next) {
    
      which matches 2.6.x
    
      I even checked 2.4.x when it was branched for 2.5.x and the test was the
      same at the point in time too.
    
      Looking at the proposed change a bit it appears that it is probably
      correct, as it's trying to check that ROOT_DEV is nfs root.  But if it is
      correct then the UNNAMED_MAJOR comparison in the same code block should be
      removed as it becomes superfluous.
    
      I'm happy to apply this patch with that modification made.
    
    Signed-off-by: Joakim Tjernlund <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/ipv4/ipconfig.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 342ca8d..c5b2470 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1281,9 +1281,9 @@ static int __init ip_auto_config(void)
         */
        if (ic_myaddr == NONE ||
 #ifdef CONFIG_ROOT_NFS
-           (MAJOR(ROOT_DEV) == UNNAMED_MAJOR
-            && root_server_addr == NONE
-            && ic_servaddr == NONE) ||
+           (root_server_addr == NONE
+            && ic_servaddr == NONE
+            && ROOT_DEV == Root_NFS) ||
 #endif
            ic_first_dev->next) {
 #ifdef IPCONFIG_DYNAMIC
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to