From owner-p4-projects@FreeBSD.ORG  Wed Sep  5 21:06:53 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BBCC416A46E; Wed,  5 Sep 2007 21:06:52 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 710FD16A41B
	for <perforce@FreeBSD.org>; Wed,  5 Sep 2007 21:06:52 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E20513C4E1
	for <perforce@FreeBSD.org>; Wed,  5 Sep 2007 21:06:52 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l85L6p44008589
	for <perforce@FreeBSD.org>; Wed, 5 Sep 2007 21:06:51 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l85L6pBV008586
	for perforce@freebsd.org; Wed, 5 Sep 2007 21:06:51 GMT
	(envelope-from zec@FreeBSD.org)
Date: Wed, 5 Sep 2007 21:06:51 GMT
Message-Id: <200709052106.l85L6pBV008586@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 126105 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Sep 2007 21:06:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=126105

Change 126105 by zec@zec_tpx32 on 2007/09/05 21:06:10

	In addition to marking the packet with M_REMOTE_VNET when
	crossing a boundary between two vnets, set / restore the
	vnet context to the vnet the netgraph node is residing in
	when dequeuing packets in ng_eiface_start2().

Affected files ...

.. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#8 edit

Differences ...

==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#8 (text+ko) ====

@@ -253,16 +253,18 @@
 			continue;
 		}
 
-#ifdef VIMAGE
-		/* Mark up the mbuf if crossing vnet boundary */
-		if (ifp->if_vnet != node->nd_vnet)
-			m->m_flags |= M_REMOTE_VNET;
-#endif
-
 		/*
 		 * Send packet; if hook is not connected, mbuf will get
 		 * freed.
 		 */
+#ifdef VIMAGE
+		if (ifp->if_vnet != node->nd_vnet) {
+			m->m_flags |= M_REMOTE_VNET;
+			CURVNET_SET_QUIET(node->nd_vnet);
+			NG_SEND_DATA_ONLY(error, priv->ether, m);
+			CURVNET_RESTORE();
+		} else
+#endif
 		NG_SEND_DATA_ONLY(error, priv->ether, m);
 
 		/* Update stats */