From owner-p4-projects@FreeBSD.ORG  Mon Oct 29 16:17: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 208A116A41B; Mon, 29 Oct 2007 16:17:57 +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 C477816A47C
	for <perforce@FreeBSD.org>; Mon, 29 Oct 2007 16:17: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 AB6C313C46E
	for <perforce@FreeBSD.org>; Mon, 29 Oct 2007 16:17: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 l9TGHupu004077
	for <perforce@FreeBSD.org>; Mon, 29 Oct 2007 16:17:56 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9TGHuTM004074
	for perforce@freebsd.org; Mon, 29 Oct 2007 16:17:56 GMT
	(envelope-from zec@FreeBSD.org)
Date: Mon, 29 Oct 2007 16:17:56 GMT
Message-Id: <200710291617.l9TGHuTM004074@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 128289 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, 29 Oct 2007 16:17:57 -0000

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

Change 128289 by zec@zec_tca51 on 2007/10/29 16:17:16

	When reassigning ifnets from one vnet to another, use
	the new vimage_by_name() function to search for the
	target vimage / vnet.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#54 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#54 (text+ko) ====

@@ -302,18 +302,12 @@
 		if (IS_DEFAULT_VIMAGE(vip))
 			return (ENXIO);
 		new_vnet = vip->vi_parent->v_net;
-	} else
-		LIST_FOREACH(new_vip, &vimage_head, vi_le) {
-			if (!vi_child_of(vip, new_vip))
-				continue;
-			if (strcmp(vi_req->vi_name, new_vip->vi_name) == 0) {
-				new_vnet = new_vip->v_net;
-				break;
-			}
-		}
-
-	if (new_vnet == NULL)
-		return (ENXIO);
+	} else {
+		new_vip = vimage_by_name(vip, vi_req->vi_name);
+		if (new_vip == NULL)
+			return (ENXIO);
+		new_vnet = new_vip->v_net;
+	}
 
 	if (ifp == NULL)
 		ifp = ifunit(vi_req->vi_chroot);