From owner-freebsd-net@FreeBSD.ORG  Sun Mar  4 11:20:04 2012
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: freebsd-net@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E7928106566B
	for <freebsd-net@hub.freebsd.org>; Sun,  4 Mar 2012 11:20:04 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id CE6C98FC08
	for <freebsd-net@hub.freebsd.org>; Sun,  4 Mar 2012 11:20:04 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q24BK4A7070837
	for <freebsd-net@freefall.freebsd.org>; Sun, 4 Mar 2012 11:20:04 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q24BK4Db070836;
	Sun, 4 Mar 2012 11:20:04 GMT (envelope-from gnats)
Date: Sun, 4 Mar 2012 11:20:04 GMT
Message-Id: <201203041120.q24BK4Db070836@freefall.freebsd.org>
To: freebsd-net@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: kern/165643: commit references a PR
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Mar 2012 11:20:05 -0000

The following reply was made to PR kern/165643; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/165643: commit references a PR
Date: Sun,  4 Mar 2012 11:11:45 +0000 (UTC)

 Author: zec
 Date: Sun Mar  4 11:11:03 2012
 New Revision: 232487
 URL: http://svn.freebsd.org/changeset/base/232487
 
 Log:
   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:
   head/sys/net/if_ethersubr.c
 
 Modified: head/sys/net/if_ethersubr.c
 ==============================================================================
 --- head/sys/net/if_ethersubr.c	Sun Mar  4 10:37:26 2012	(r232486)
 +++ head/sys/net/if_ethersubr.c	Sun Mar  4 11:11:03 2012	(r232487)
 @@ -661,8 +661,10 @@ ether_input_internal(struct ifnet *ifp, 
  		m = (*lagg_input_p)(ifp, m);
  		if (m != NULL)
  			ifp = m->m_pkthdr.rcvif;
 -		else 
 +		else {
 +			CURVNET_RESTORE();
  			return;
 +		}
  	}
  
  	/*
 @@ -681,6 +683,7 @@ ether_input_internal(struct ifnet *ifp, 
  #endif
  			ifp->if_ierrors++;
  			m_freem(m);
 +			CURVNET_RESTORE();
  			return;
  		}
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"