Date: Wed, 28 Mar 2012 12:41:17 +0000 (UTC) From: Marko Zec <zec@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r233603 - in stable/8/sys: i386/conf net Message-ID: <201203281241.q2SCfHmN036308@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zec Date: Wed Mar 28 12:41:17 2012 New Revision: 233603 URL: http://svn.freebsd.org/changeset/base/233603 Log: MFC 232487: Properly restore curvnet context when returning early from ether_input_internal(). This change only affects options VIMAGE kernel builds. PR: kern/165643 Submitted by: Vijay Singh MFC after: 3 days Modified: stable/8/sys/net/if_ethersubr.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/boot/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/e1000/ (props changed) stable/8/sys/i386/conf/XENHVM (props changed) Modified: stable/8/sys/net/if_ethersubr.c ============================================================================== --- stable/8/sys/net/if_ethersubr.c Wed Mar 28 12:40:30 2012 (r233602) +++ stable/8/sys/net/if_ethersubr.c Wed Mar 28 12:41:17 2012 (r233603) @@ -660,8 +660,10 @@ ether_input(struct ifnet *ifp, struct mb m = (*lagg_input_p)(ifp, m); if (m != NULL) ifp = m->m_pkthdr.rcvif; - else + else { + CURVNET_RESTORE(); return; + } } /* @@ -680,6 +682,7 @@ ether_input(struct ifnet *ifp, struct mb #endif ifp->if_ierrors++; m_freem(m); + CURVNET_RESTORE(); return; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203281241.q2SCfHmN036308>