From owner-p4-projects@FreeBSD.ORG  Wed May  2 21:40:16 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 634A816A407; Wed,  2 May 2007 21:40:16 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 302E616A402
	for <perforce@FreeBSD.org>; Wed,  2 May 2007 21:40:16 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 2043E13C457
	for <perforce@FreeBSD.org>; Wed,  2 May 2007 21:40:16 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l42LeGgQ017107
	for <perforce@FreeBSD.org>; Wed, 2 May 2007 21:40:16 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l42LeF5J017095
	for perforce@freebsd.org; Wed, 2 May 2007 21:40:15 GMT
	(envelope-from zec@FreeBSD.org)
Date: Wed, 2 May 2007 21:40:15 GMT
Message-Id: <200705022140.l42LeF5J017095@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 119185 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, 02 May 2007 21:40:16 -0000

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

Change 119185 by zec@zec_tpx32 on 2007/05/02 21:39:29

	It is possible that an ifnet and a netgraph node it is
	associated to are attached to different vnets.  In netgraph
	node destructor for such a node/ifnet (ng_iface or ng_eiface)
	pair, before calling if_detach() we must set the current
	vnet context to the vnet that our ifnet is associated to.

Affected files ...

.. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#4 edit
.. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#2 edit

Differences ...

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

@@ -28,6 +28,8 @@
  * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.38 2007/03/08 21:10:53 ru Exp $
  */
 
+#include "opt_vimage.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
@@ -38,6 +40,7 @@
 #include <sys/sockio.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -539,8 +542,10 @@
 	const priv_p priv = NG_NODE_PRIVATE(node);
 	struct ifnet *const ifp = priv->ifp;
 
+	CURVNET_SET_QUIET(ifp->if_vnet);
 	ether_ifdetach(ifp);
 	if_free(ifp);
+	CURVNET_RESTORE();
 	free_unr(ng_eiface_unit, priv->unit);
 	FREE(priv, M_NETGRAPH);
 	NG_NODE_SET_PRIVATE(node, NULL);

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

@@ -56,6 +56,7 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
+#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -69,6 +70,7 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/libkern.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -766,9 +768,11 @@
 {
 	const priv_p priv = NG_NODE_PRIVATE(node);
 
+	CURVNET_SET_QUIET(priv->ifp->if_vnet);
 	bpfdetach(priv->ifp);
 	if_detach(priv->ifp);
 	if_free(priv->ifp);
+	CURVNET_RESTORE();
 	priv->ifp = NULL;
 	free_unr(ng_iface_unit, priv->unit);
 	FREE(priv, M_NETGRAPH_IFACE);