Date: Sun, 23 May 2021 01:06:48 GMT From: Eugene Grosbein <eugen@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: bb12347c3b30 - stable/12 - if_vlan.c: fix breakage after previous merge Message-ID: <202105230106.14N16mZw040819@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=bb12347c3b302c5a07085a94e52adc4f2008b4e2 commit bb12347c3b302c5a07085a94e52adc4f2008b4e2 Author: Eugene Grosbein <eugen@FreeBSD.org> AuthorDate: 2021-05-23 01:04:47 +0000 Commit: Eugene Grosbein <eugen@FreeBSD.org> CommitDate: 2021-05-23 01:04:47 +0000 if_vlan.c: fix breakage after previous merge Fix breakage after the commit 18fa0cbfc4e906fbf824651140f68d0a85c1d08f. This is direct commit to stable/12 due to code base difference with head. --- sys/net/if_vlan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 450c4b9bbe3b..1830c1cc441a 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1189,15 +1189,15 @@ vlan_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, struct ifvlan *ifv; struct ifnet *p; - NET_EPOCH_ENTER(et); + NET_EPOCH_ENTER(); ifv = ifp->if_softc; if (TRUNK(ifv) == NULL) { - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT(); m_freem(m); return (ENETDOWN); } p = PARENT(ifv); - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT(); return p->if_output(ifp, m, dst, ro); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105230106.14N16mZw040819>