-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 104827151e2abc7fe6fb9bf59a12b443657d1506 Auto-Submitted: auto-generated Date: Wed, 17 Dec 2025 22:06:09 +0000 Message-Id: <69432951.474a6.4ba2dd23@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=104827151e2abc7fe6fb9bf59a12b443657d1506 commit 104827151e2abc7fe6fb9bf59a12b443657d1506 Author: Gleb Smirnoff AuthorDate: 2025-12-17 22:05:53 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-17 22:05:53 +0000 ng_iface: don't recursively enter epoch in the rcvdata method Reviewed by: p.mousavizadeh_protonmail.com, zlei Differential Revision: https://reviews.freebsd.org/D54241 --- sys/netgraph/ng_iface.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index fbe89e13474b..aa150719dbf9 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -680,7 +680,6 @@ ng_iface_rcvdata(hook_p hook, item_p item) const priv_p priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); const iffam_p iffam = get_iffam_from_hook(priv, hook); struct ifnet *const ifp = priv->ifp; - struct epoch_tracker et; struct mbuf *m; int isr; @@ -723,9 +722,7 @@ ng_iface_rcvdata(hook_p hook, item_p item) random_harvest_queue(m, sizeof(*m), RANDOM_NET_NG); M_SETFIB(m, ifp->if_fib); CURVNET_SET(ifp->if_vnet); - NET_EPOCH_ENTER(et); netisr_dispatch(isr, m); - NET_EPOCH_EXIT(et); CURVNET_RESTORE(); return (0); }