PERFORCE change 163504 for review

[Marko Zec]

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

Change 163504 by zec at zec_tpx32 on 2009/06/04 17:45:06

	Revert 163490, i.e. freeing memory on vimage -d is now OK
	again after nailing down at least the most pressing uncancelled
	callout in in6_rmx.c.

Affected files ...

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

Differences ...

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

@@ -563,10 +563,8 @@
 	if (vmi->vmi_size) {
 		if (curvnet->mod_data[vmi->vmi_id] == NULL)
 			panic("vi_destroy: %s\n", vmi->vmi_name);
-#ifdef NOTYET
 		free(curvnet->mod_data[vmi->vmi_id], M_VNET);
 		curvnet->mod_data[vmi->vmi_id] = NULL;
-#endif
 	}
 #endif
 
@@ -710,10 +708,6 @@
 	TAILQ_FOREACH_SAFE(ifp, &V_ifnet, if_link, nifp) {
 		if (ifp->if_home_vnet != ifp->if_vnet)
 			vi_if_move(NULL, ifp, vip);
-#ifdef NOTYET
-		else
-			if_clone_destroy(ifp->if_xname);
-#endif
 	}
 
 	/* Detach / free per-module state instances. */
@@ -725,9 +719,7 @@
 
 	/* hopefully, we are finally OK to free the vnet container itself! */
 	vnet->vnet_magic_n = 0xdeadbeef;
-#ifdef NOTYET
 	free(vnet, M_VNET);
-#endif
 	free(vprocg, M_VPROCG);
 	free(vip, M_VIMAGE);