From owner-p4-projects@FreeBSD.ORG  Wed Jun 18 19:42:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2889E1065679; Wed, 18 Jun 2008 19:42:28 +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 DE9AB1065676
	for <perforce@FreeBSD.org>; Wed, 18 Jun 2008 19:42:27 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C55328FC2B
	for <perforce@FreeBSD.org>; Wed, 18 Jun 2008 19:42:27 +0000 (UTC)
	(envelope-from zec@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 m5IJgRJW099881
	for <perforce@FreeBSD.org>; Wed, 18 Jun 2008 19:42:27 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IJgR1O099879
	for perforce@freebsd.org; Wed, 18 Jun 2008 19:42:27 GMT
	(envelope-from zec@FreeBSD.org)
Date: Wed, 18 Jun 2008 19:42:27 GMT
Message-Id: <200806181942.m5IJgR1O099879@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 143710 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: Wed, 18 Jun 2008 19:42:28 -0000

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

Change 143710 by zec@zec_tpx32 on 2008/06/18 19:41:39

	Unbreak nooptions DIAGNOSTIC builds, and more WS cleanup.

Affected files ...

.. //depot/projects/vimage/src/sys/net/if.c#27 edit
.. //depot/projects/vimage/src/sys/net/if_clone.c#7 edit

Differences ...

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

@@ -2602,7 +2602,9 @@
 void
 if_delmulti_ifma(struct ifmultiaddr *ifma)
 {
+#ifdef DIAGNOSTIC
 	INIT_VNET_NET(curvnet);
+#endif
 	struct ifnet *ifp;
 	int lastref;
 
@@ -2883,6 +2885,7 @@
 if_register_com_alloc(u_char type,
     if_com_alloc_t *a, if_com_free_t *f)
 {
+
 	KASSERT(if_com_alloc[type] == NULL,
 	    ("if_register_com_alloc: %d already registered", type));
 	KASSERT(if_com_free[type] == NULL,
@@ -2895,6 +2898,7 @@
 void
 if_deregister_com_alloc(u_char type)
 {
+
 	KASSERT(if_com_alloc[type] != NULL,
 	    ("if_deregister_com_alloc: %d not registered", type));
 	KASSERT(if_com_free[type] != NULL,

==== //depot/projects/vimage/src/sys/net/if_clone.c#7 (text+ko) ====

@@ -470,6 +470,7 @@
 #ifndef VIMAGE
 	int bytoff, bitoff;
 
+
 	/*
 	 * Compute offset in the bitmap and deallocate the unit.
 	 */