From nobody Fri Sep 12 16:28:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cNfy35S2Lz67djD; Fri, 12 Sep 2025 16:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cNfy34lmcz3Qxb; Fri, 12 Sep 2025 16:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757694539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eInsUtsP0RX7EPHsvnStBTPkL7w6YEvBBTZqb96C+3g=; b=B6b8uy50zSRtQRSd7mt1kVif5z7VOU8LoSj6L7WHWD2FZRUkNjV++YSQ8q5DMd5JRyzBAc 3HFSWaGuxE4HvLGyDufBuneoUAKBV2FdoTcvZUQjCTQji79OKUuQVM8szsKdr7j6A8ZtpD xUIlNdp1mwah3wenqB4sZ6qyY4d/gxw5fFlSZekj5y7w/XE4tPW3Q/pOVzydgTjsrTZFar w4hbArj49htsqGAZlIvJ8Jr8fs0uwgbi7pP7ho4nApg0GOIERdyndGYraxfCDKndSblRwi /biS84QfvFhkbhkDW+c4eMSnu+zUlCylCOhM3GAWm+P16phNExLT5o+BxWsP7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757694539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eInsUtsP0RX7EPHsvnStBTPkL7w6YEvBBTZqb96C+3g=; b=QZJfqdS0CVL5JTtD6uR6rQJqtnyn9ZJmJshgM7J3rrFwnIwOR8TOQE7K6ZttgyYU+Afzet Flu3oVZWjz0h/4RZ4b5QSGZxsjSx9Tp7JGpQXXKtuJveQptSyrerkIDyLin1I75zf37j8j QbfX6yhhirWIXhvgweu3dHraVkJy5apD23YcT+0N2+qZwwcdWdbupBUGNArZWTu9vHnW4u 4FIsd+yMYUcA2xsRpz5zjEKnwTqDaOQ9rFb6D5CP2uQ7NJZQ3JkfLxfBJyz91EfKNoo/EV keWC4QwjPW/kOiYP/0YEWm3tE7SvZ2aG6wudf127Sx58GyYDdblIvKhPWvUfWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757694539; a=rsa-sha256; cv=none; b=Y/BJ14ywSk/o9BRroPoM/5w36zNv9bSzFISxJoCtpOiobOzAijMUhXK/CNaO+2K4y3avT2 rKS4s9zOnBfVWCAWmk+adRVo+W8jzmphsM6fVWo4HserQKJZRpgMXVYcR98vKEfBtfi/vQ ZaRKD2+eP4nGqPg9tARQXbU6B5x1KiB/2zfs5Kic9VBLsn+yHkP5Mu87/fXQxbgMZVKm3Q VbYE+RDUU8jXcoqeXAyNLifBw9IXjvoDj6FQ8rBNgdDOvNAIEEv/KCSlDbG6vIBH/QmKp8 fWvLkUjXtJ18Km+GloCWU3p4DXRrpUgy6OTS+TKPVFLe4GdSIvu7FL1hit82WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cNfy34BFpz10nZ; Fri, 12 Sep 2025 16:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58CGSx0j019386; Fri, 12 Sep 2025 16:28:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58CGSxhC019383; Fri, 12 Sep 2025 16:28:59 GMT (envelope-from git) Date: Fri, 12 Sep 2025 16:28:59 GMT Message-Id: <202509121628.58CGSxhC019383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 593d432e5852 - main - ng_device: replace dependency on vnode.h with fcntl.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 593d432e5852a254eeef83a8b1762492bb08668e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=593d432e5852a254eeef83a8b1762492bb08668e commit 593d432e5852a254eeef83a8b1762492bb08668e Author: Quentin Thébault AuthorDate: 2025-08-28 06:27:03 +0000 Commit: Warner Losh CommitDate: 2025-09-12 16:24:26 +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 Reviewed by: imp, jhb Pull Request: https://github.com/freebsd/freebsd-src/pull/1827 --- 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 #include #include -#include +#include #include #include @@ -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;