[PATCH]ip_auto_config bug in 2.6.20-rc6

[Joakim Tjernlund <joakim.tjernlund@transmode.se>]

On Thu, 2007-02-01 at 12:26 +0100, Joakim Tjernlund wrote:
> 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.
> 
>  Jocke

The following patch fixes the above problem. This change was present in
2.4 but has been removed from 2.6, dunno why.

Signed-off-by: Joakim Tjernlund <joakim.tjernlund@transmode.se>

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 9f245de..b90479c 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1282,7 +1282,8 @@ static int __init ip_auto_config(void)
 #ifdef CONFIG_ROOT_NFS
 	    (MAJOR(ROOT_DEV) == UNNAMED_MAJOR
 	     && root_server_addr == NONE
-	     && ic_servaddr == 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 linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/