From owner-p4-projects@FreeBSD.ORG  Sun Jan 21 10:24:58 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 50E6516A404; Sun, 21 Jan 2007 10:24:58 +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 17BCE16A402
	for <perforce@FreeBSD.org>; Sun, 21 Jan 2007 10:24:58 +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 093CC13C455
	for <perforce@FreeBSD.org>; Sun, 21 Jan 2007 10:24:58 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LAOvnx087962
	for <perforce@FreeBSD.org>; Sun, 21 Jan 2007 10:24:57 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LAOvAp087959
	for perforce@freebsd.org; Sun, 21 Jan 2007 10:24:57 GMT
	(envelope-from zec@FreeBSD.org)
Date: Sun, 21 Jan 2007 10:24:57 GMT
Message-Id: <200701211024.l0LAOvAp087959@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 113247 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: Sun, 21 Jan 2007 10:24:58 -0000

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

Change 113247 by zec@zec_tpx32 on 2007/01/21 10:24:33

	The diskless NFS booting process can operate only in the
	default vnet -> always resolve V_inet in vnetb_0.

Affected files ...

.. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#3 edit

Differences ...

==== //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#3 (text+ko) ====

@@ -36,14 +36,17 @@
 __FBSDID("$FreeBSD: src/sys/nfsclient/nfs_diskless.c,v 1.17 2006/12/06 02:15:25 sam Exp $");
 
 #include "opt_bootp.h"
+#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
+#include <sys/socket.h>
+#include <sys/vimage.h>
 
-#include <sys/socket.h>
+#include <net/vnet.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
@@ -148,6 +151,7 @@
 void
 nfs_setup_diskless(void)
 {
+	INIT_VNET_NET(&vnetb_0);
 	struct nfs_diskless *nd = &nfs_diskless;
 	struct ifnet *ifp;
 	struct ifaddr *ifa;
@@ -176,7 +180,7 @@
 	}
 	ifa = NULL;
 	IFNET_RLOCK();
-	TAILQ_FOREACH(ifp, &ifnet, if_link) {
+	TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
 		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 			if (ifa->ifa_addr->sa_family == AF_LINK) {
 				sdl = (struct sockaddr_dl *)ifa->ifa_addr;