From owner-svn-src-all@FreeBSD.ORG  Wed Mar 28 12:41:18 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2C3771065670;
	Wed, 28 Mar 2012 12:41:18 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 167308FC1D;
	Wed, 28 Mar 2012 12:41:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2SCfHhC036310;
	Wed, 28 Mar 2012 12:41:17 GMT (envelope-from zec@svn.freebsd.org)
Received: (from zec@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2SCfHmN036308;
	Wed, 28 Mar 2012 12:41:17 GMT (envelope-from zec@svn.freebsd.org)
Message-Id: <201203281241.q2SCfHmN036308@svn.freebsd.org>
From: Marko Zec <zec@FreeBSD.org>
Date: Wed, 28 Mar 2012 12:41:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233603 - in stable/8/sys: i386/conf net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Mar 2012 12:41:18 -0000

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;
 		}