diff options
| author | phk <phk@FreeBSD.org> | 2004-12-22 17:29:37 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-12-22 17:29:37 +0000 |
| commit | 6ab1262cc8b3a49294e29084a0e27d6a0f1785f3 (patch) | |
| tree | 205480c835f43cc828c5bdd34ae790ccad846393 /sys/dev/random | |
| parent | a7cd5bffcaa4070b2720ef019c6794e22c331e9a (diff) | |
| download | FreeBSD-src-6ab1262cc8b3a49294e29084a0e27d6a0f1785f3.zip FreeBSD-src-6ab1262cc8b3a49294e29084a0e27d6a0f1785f3.tar.gz | |
Check O_NONBLOCK not IO_NDELAY.
Don't include vnode.h
Diffstat (limited to 'sys/dev/random')
| -rw-r--r-- | sys/dev/random/randomdev.c | 3 | ||||
| -rw-r--r-- | sys/dev/random/randomdev_soft.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index 79dbe5f..e18be5a 100644 --- a/sys/dev/random/randomdev.c +++ b/sys/dev/random/randomdev.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include <sys/selinfo.h> #include <sys/uio.h> #include <sys/unistd.h> -#include <sys/vnode.h> #include <machine/bus.h> #include <machine/cpu.h> @@ -105,7 +104,7 @@ random_read(struct cdev *dev __unused, struct uio *uio, int flag) /* Blocking logic */ while (!random_systat.seeded && !error) { - if (flag & IO_NDELAY) + if (flag & O_NONBLOCK) error = EWOULDBLOCK; else { printf("Entropy device is blocking.\n"); diff --git a/sys/dev/random/randomdev_soft.c b/sys/dev/random/randomdev_soft.c index ebc6ba6..fb25d5c 100644 --- a/sys/dev/random/randomdev_soft.c +++ b/sys/dev/random/randomdev_soft.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/uio.h> #include <sys/unistd.h> -#include <sys/vnode.h> #include <machine/bus.h> #include <machine/cpu.h> |
