From owner-p4-projects@FreeBSD.ORG  Thu Jul  3 09:39:22 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E6B71106566C; Thu,  3 Jul 2008 09:39:21 +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 A7502106567E
	for <perforce@freebsd.org>; Thu,  3 Jul 2008 09:39:21 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 901388FC1C
	for <perforce@freebsd.org>; Thu,  3 Jul 2008 09:39:21 +0000 (UTC)
	(envelope-from julian@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 m639dLNo030564
	for <perforce@freebsd.org>; Thu, 3 Jul 2008 09:39:21 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m639dLMS030562
	for perforce@freebsd.org; Thu, 3 Jul 2008 09:39:21 GMT
	(envelope-from julian@freebsd.org)
Date: Thu, 3 Jul 2008 09:39:21 GMT
Message-Id: <200807030939.m639dLMS030562@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 144545 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: Thu, 03 Jul 2008 09:39:22 -0000

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

Change 144545 by julian@julian_trafmon1 on 2008/07/03 09:38:44

	Aint kepping up with -current fun?

Affected files ...

.. //depot/projects/vimage/src/sys/net80211/ieee80211.c#16 edit
.. //depot/projects/vimage/src/sys/netinet6/in6_src.c#17 edit
.. //depot/projects/vimage/src/sys/nlm/nlm_advlock.c#2 edit

Differences ...

==== //depot/projects/vimage/src/sys/net80211/ieee80211.c#16 (text+ko) ====

@@ -219,7 +219,6 @@
 void
 ieee80211_ifattach(struct ieee80211com *ic)
 {
-	INIT_VNET_NET(curvnet);
 	struct ifnet *ifp = ic->ic_ifp;
 	struct sockaddr_dl *sdl;
 	struct ifaddr *ifa;

==== //depot/projects/vimage/src/sys/netinet6/in6_src.c#17 (text+ko) ====

@@ -455,7 +455,6 @@
     struct ifnet **retifp, struct rtentry **retrt, int clone,
     int norouteok)
 {
-	INIT_VNET_NET(curvnet);
 	INIT_VNET_INET6(curvnet);
 	int error = 0;
 	struct ifnet *ifp = NULL;

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

@@ -25,6 +25,7 @@
  * SUCH DAMAGE.
  */
 
+#include "opt_vimage.h"
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/nlm/nlm_advlock.c,v 1.1 2008/06/26 10:21:54 dfr Exp $");
 
@@ -42,6 +43,7 @@
 #include <sys/systm.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
+#include <sys/vimage.h>
 
 #include <rpc/rpcclnt.h>
 #include <nfs/nfsproto.h>
@@ -1218,11 +1220,11 @@
 			return (EOVERFLOW);
 	}
 
-	snprintf(oh_space, 32, "%d@%s", svid, hostname);
+	snprintf(oh_space, 32, "%d@%s", svid, G_hostname);
 	oh_len = strlen(oh_space);
 
 	memset(lock, 0, sizeof(*lock));
-	lock->caller_name = hostname;
+	lock->caller_name = G_hostname;
 	lock->fh.n_len = fhlen;
 	lock->fh.n_bytes = fh;
 	lock->oh.n_len = oh_len;