PERFORCE change 161153 for review

[Marko Zec]

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

Change 161153 by zec at zec_amdx2 on 2009/04/26 22:48:24

	Unbreak options VIMAGE kernel build.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/net/if.c#48 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#14 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/net/if.c#48 (text+ko) ====

@@ -546,6 +546,7 @@
 static void
 if_free_internal(struct ifnet *ifp)
 {
+	INIT_VNET_NET(ifp->if_vnet);
 
 	KASSERT((ifp->if_flags & IFF_DYING),
 	    ("if_free_internal: interface not dying"));
@@ -583,7 +584,6 @@
 void
 if_free_type(struct ifnet *ifp, u_char type)
 {
-	INIT_VNET_NET(curvnet); /* ifp->if_vnet can be NULL here ! */
 
 	KASSERT(ifp->if_alloctype == type,
 	    ("if_free_type: type (%d) != alloctype (%d)", type,

==== //depot/projects/vimage-commit2/src/sys/net/if_mib.c#14 (text+ko) ====

@@ -77,7 +77,6 @@
 static int
 sysctl_ifdata(SYSCTL_HANDLER_ARGS) /* XXX bad syntax! */
 {
-	INIT_VNET_NET(curvnet);
 	int *name = (int *)arg1;
 	int error;
 	u_int namelen = arg2;