diff options
author | msmith <msmith@FreeBSD.org> | 2000-09-05 22:29:36 +0000 |
---|---|---|
committer | msmith <msmith@FreeBSD.org> | 2000-09-05 22:29:36 +0000 |
commit | 7de3089b6a7f9d9fbffbace0dd339801cae61e73 (patch) | |
tree | c887eca6ef25277554ec9f378243b6b0873a663d | |
parent | e2f94e5aa58467068d378732c0bb30aa46c50cef (diff) | |
download | FreeBSD-src-7de3089b6a7f9d9fbffbace0dd339801cae61e73.zip FreeBSD-src-7de3089b6a7f9d9fbffbace0dd339801cae61e73.tar.gz |
Don't scan for the "right" network interface by shooting in the dark.
Assume that the nfs_diskless structure is correctly set up; the provider
ought to be getting it right.
-rw-r--r-- | sys/nfs/nfs_vfsops.c | 3 | ||||
-rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index c2d365b..c16d2ae 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -441,6 +441,7 @@ nfs_mountroot(mp) panic("nfs_mountroot: socreate(%04x): %d", nd->myif.ifra_addr.sa_family, error); +#if 0 /* XXX Bad idea */ /* * We might not have been told the right interface, so we pass * over the first ten interfaces of the same kind, until we get @@ -455,6 +456,8 @@ nfs_mountroot(mp) if(!error) break; } +#endif + error = ifioctl(so, SIOCAIFADDR, (caddr_t)&nd->myif, p); if (error) panic("nfs_mountroot: SIOCAIFADDR: %d", error); soclose(so); diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index c2d365b..c16d2ae 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -441,6 +441,7 @@ nfs_mountroot(mp) panic("nfs_mountroot: socreate(%04x): %d", nd->myif.ifra_addr.sa_family, error); +#if 0 /* XXX Bad idea */ /* * We might not have been told the right interface, so we pass * over the first ten interfaces of the same kind, until we get @@ -455,6 +456,8 @@ nfs_mountroot(mp) if(!error) break; } +#endif + error = ifioctl(so, SIOCAIFADDR, (caddr_t)&nd->myif, p); if (error) panic("nfs_mountroot: SIOCAIFADDR: %d", error); soclose(so); |