Date: Sun, 5 Jun 2016 17:31:36 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r301458 - projects/vnet/sys/net Message-ID: <201606051731.u55HVakG096624@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Sun Jun 5 17:31:36 2016 New Revision: 301458 URL: https://svnweb.freebsd.org/changeset/base/301458 Log: Fix a wonderful SVN mismerge. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/net/if_ethersubr.c Modified: projects/vnet/sys/net/if_ethersubr.c ============================================================================== --- projects/vnet/sys/net/if_ethersubr.c Sun Jun 5 17:11:23 2016 (r301457) +++ projects/vnet/sys/net/if_ethersubr.c Sun Jun 5 17:31:36 2016 (r301458) @@ -754,7 +754,6 @@ ether_input(struct ifnet *ifp, struct mb KASSERT(m->m_pkthdr.rcvif == ifp, ("%s: ifnet mismatch m %p " "rcvif %p ifp %p", __func__, m, m->m_pkthdr.rcvif, ifp)); CURVNET_SET_QUIET(ifp->if_vnet); - CURVNET_SET_QUIET(ifp->if_vnet); netisr_dispatch(NETISR_ETHER, m); CURVNET_RESTORE(); m = mn;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606051731.u55HVakG096624>