git: 10a15419c460 - stable/15 - ng_device: replace dependency on vnode.h with fcntl.h
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 01 Dec 2025 16:38:06 UTC
The branch stable/15 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=10a15419c460dc59ab346f352ca66f5b7f8fcf06
commit 10a15419c460dc59ab346f352ca66f5b7f8fcf06
Author: Quentin Thébault <quentin.thebault@defenso.fr>
AuthorDate: 2025-08-28 06:27:03 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-12-01 16:37:56 +0000
ng_device: replace dependency on vnode.h with fcntl.h
Update to current convention of using fcntl.h O_* flags instead of vnode.h IO_*
ones, as explained in sys/fs/devfs/devfs_vnops.c.
Signed-off-by: Quentin Thébault <quentin.thebault@defenso.fr>
Reviewed by: imp, jhb
Pull Request: https://github.com/freebsd/freebsd-src/pull/1827
(cherry picked from commit 593d432e5852a254eeef83a8b1762492bb08668e)
---
sys/netgraph/ng_device.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/netgraph/ng_device.c b/sys/netgraph/ng_device.c
index e4fcdfc635cb..79cae9933a5a 100644
--- a/sys/netgraph/ng_device.c
+++ b/sys/netgraph/ng_device.c
@@ -51,7 +51,7 @@
#include <sys/syslog.h>
#include <sys/systm.h>
#include <sys/uio.h>
-#include <sys/vnode.h>
+#include <sys/fcntl.h>
#include <net/ethernet.h>
#include <net/if.h>
@@ -457,7 +457,7 @@ ngdread(struct cdev *dev, struct uio *uio, int flag)
do {
IF_DEQUEUE(&priv->readq, m);
if (m == NULL) {
- if (flag & IO_NDELAY)
+ if (flag & O_NONBLOCK)
return (EWOULDBLOCK);
mtx_lock(&priv->ngd_mtx);
priv->flags |= NGDF_RWAIT;