From nobody Mon Dec 1 16:38:06 2025 X-Original-To: dev-commits-src-all@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 4dKqMf72cmz6Js98 for ; Mon, 01 Dec 2025 16:38:06 +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 4dKqMf63dVz3d5r for ; Mon, 01 Dec 2025 16:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764607086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zUnQjJOa2AHW3MN637NZUxAclwBqdVau3QF4A7qzikI=; b=vBBxt+GVDvyJMJIMBNd/oW4wCcF1PXkN8C2Jq8Oeub0kyQFcSuaLCYwlLFNI6N3TjRQvgo PWxRHHKiEAJXhmLfRgBl6Uzgoqsi/w7wyrqmPOWWpQZc2TXEr4X6xm/hD69Yp/NP2FOIdc 2B2OVt85z4pNlgopjxOVs693Gb1MsYoX//QkI396r8ayPhrIZVo7HwGodRaPEju1PhMCtG PXFJhuSvDHe3E5PmXV7JfwO75VK/a7xyPjOSBlQGEl71CQ1Hr7CKic7SVb6rB72u1qXBpT ZLxEkUTbV4IuVizFfBHtQ7KAAU4qMUJPKTj42cFAkE5xjFsBgtoe8DGIYKdxiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764607086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zUnQjJOa2AHW3MN637NZUxAclwBqdVau3QF4A7qzikI=; b=NlsRRTCdNSWLtCIbBr3spNAxkGKls7fTt1o6zXXNwrVOSezscLRA8mMfThd8o/yubDpGVC TPdiQ6CoSFClyW9EL1YxIbrThl/RirpXu/zqe4wW8qv3RY2mPyAAM3WCy1bp+kF3KrlMAC LNKcQNGJK789n4LmG5Fv17kQ7GQV+h9wkoOUCS8uGES8446cx9PzVLE8nuwdCgHl+tnWgm xYBtJsxzl1/xNNATa5s9TnDevRcj8aQR7BP52oL/U2n2UQFupE7K8PIJKvrKygv+wlXoHC 4kiPmGCpXC2D+K0ExQT8xWWqH+JcZ1YsmW0jLQioQ5RpcbwpckkdABFvUY016w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764607086; a=rsa-sha256; cv=none; b=Z8mg6X++AFSaMyFeSRc/VYAEFLld8FQALJDApsOGA9ocgn+4Dmh//dDX2iIRxyfEnzhIcR 2wet5ru+sFh8ygSfPhUrjzJHA7W17l8X4a1VR9IGBOHjUYE/hNWLoZgwpxnc/GTspTnxus oIXeUcG2zQoviCEU6C+w61Ycw4AUHoQJo1q4WuQAfyl92wt8Rfyowu4hcNIuhJA2e9zNbo 7fMBqdw08qAUjFRaH/rFCwdxWVKBV774vO95KNrxjvVVMcpqVP/sxBHwQWkHFvGkykeOY9 E3nf5+tN8bvjj7lxRbNdgmxhd+TEEb7jmNxvF0n5ONEJNO2GxtFU+aYz2+NFPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKqMf5QKVzCpc for ; Mon, 01 Dec 2025 16:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 355e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 16:38:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Mark Johnston Subject: git: 10a15419c460 - stable/15 - ng_device: replace dependency on vnode.h with fcntl.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 10a15419c460dc59ab346f352ca66f5b7f8fcf06 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 16:38:06 +0000 Message-Id: <692dc46e.355e5.35b96da1@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=10a15419c460dc59ab346f352ca66f5b7f8fcf06 commit 10a15419c460dc59ab346f352ca66f5b7f8fcf06 Author: Quentin Thébault AuthorDate: 2025-08-28 06:27:03 +0000 Commit: Mark Johnston 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 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 #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;