PERFORCE change 144545 for review

[Julian Elischer]

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

Change 144545 by julian at 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;