From owner-p4-projects@FreeBSD.ORG  Mon Sep 10 00:20:57 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D008E16A421; Mon, 10 Sep 2007 00:20:56 +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 A215216A417
	for <perforce@FreeBSD.org>; Mon, 10 Sep 2007 00:20:56 +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 7A68113C45B
	for <perforce@FreeBSD.org>; Mon, 10 Sep 2007 00:20:56 +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 l8A0KuS9002085
	for <perforce@FreeBSD.org>; Mon, 10 Sep 2007 00:20:56 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8A0KuJc002076
	for perforce@freebsd.org; Mon, 10 Sep 2007 00:20:56 GMT
	(envelope-from zec@FreeBSD.org)
Date: Mon, 10 Sep 2007 00:20:56 GMT
Message-Id: <200709100020.l8A0KuJc002076@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 126247 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: Mon, 10 Sep 2007 00:20:57 -0000

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

Change 126247 by zec@zec_tpx32 on 2007/09/10 00:20:43

	Set curvnet to ifp->if_vnet for each ifnet in
	if_clone_destroyif() during the cleanup process.  This
	is necessary since it is possible for cloning ifnets
	to be assigned to remote vnets.

Affected files ...

.. //depot/projects/vimage/src/sys/net/if_clone.c#6 edit

Differences ...

==== //depot/projects/vimage/src/sys/net/if_clone.c#6 (text+ko) ====

@@ -208,15 +208,14 @@
 {
 	int err;
 
-	if (ifc->ifc_destroy == NULL) {
-		err = EOPNOTSUPP;
-		goto done;
-	}
+	if (ifc->ifc_destroy == NULL)
+		return(EOPNOTSUPP);
 
 	IF_CLONE_LOCK(ifc);
 	IFC_IFLIST_REMOVE(ifc, ifp);
 	IF_CLONE_UNLOCK(ifc);
 
+	CURVNET_SET_QUIET(ifp->if_vnet);
 	if_delgroup(ifp, ifc->ifc_name);
 
 	err =  (*ifc->ifc_destroy)(ifc, ifp);
@@ -228,8 +227,7 @@
 		IFC_IFLIST_INSERT(ifc, ifp);
 		IF_CLONE_UNLOCK(ifc);
 	}
-
-done:
+	CURVNET_RESTORE();
 	return (err);
 }