diff options
| author | Alexander Viro <viro@math.psu.edu> | 2002-06-11 00:55:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-11 00:55:44 -0700 |
| commit | 334c8b07f4e6ec3280022bf226c814c2c1c1b330 (patch) | |
| tree | 6dc4bd1f2a2fa79444ef346947d5a8b6be4df83d /net/ipv4 | |
| parent | 92ca434dc41a32983059730d3682567fd9b034c4 (diff) | |
[PATCH] (7/14) resync
ROOT_DEV converted to dev_t. There's no reason for it to be kdev_t -
it's both used as a number and set as a number.
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ipconfig.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 6a4d7664e286..4ee3ed1be090 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -48,6 +48,7 @@ #include <linux/udp.h> #include <linux/proc_fs.h> #include <linux/major.h> +#include <linux/root_dev.h> #include <net/arp.h> #include <net/ip.h> #include <net/ipconfig.h> @@ -1145,7 +1146,7 @@ static int __init ip_auto_config(void) */ if (ic_myaddr == INADDR_NONE || #ifdef CONFIG_ROOT_NFS - (major(ROOT_DEV) == UNNAMED_MAJOR + (MAJOR(ROOT_DEV) == UNNAMED_MAJOR && root_server_addr == INADDR_NONE && ic_servaddr == INADDR_NONE) || #endif @@ -1172,7 +1173,7 @@ static int __init ip_auto_config(void) * -- Chip */ #ifdef CONFIG_ROOT_NFS - if (kdev_same(ROOT_DEV, mk_kdev(UNNAMED_MAJOR, 255))) { + if (ROOT_DEV == Root_NFS) { printk(KERN_ERR "IP-Config: Retrying forever (NFS root)...\n"); goto try_try_again; |