From owner-p4-projects@FreeBSD.ORG  Sat Jan 27 01:53:45 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9FA2516A403; Sat, 27 Jan 2007 01:53:45 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 518FF16A400
	for <perforce@FreeBSD.org>; Sat, 27 Jan 2007 01:53:45 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 42B8A13C481
	for <perforce@FreeBSD.org>; Sat, 27 Jan 2007 01:53:45 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0R1rja9017242
	for <perforce@FreeBSD.org>; Sat, 27 Jan 2007 01:53:45 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0R1ri7g017236
	for perforce@freebsd.org; Sat, 27 Jan 2007 01:53:44 GMT
	(envelope-from zec@FreeBSD.org)
Date: Sat, 27 Jan 2007 01:53:44 GMT
Message-Id: <200701270153.l0R1ri7g017236@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 113587 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: Sat, 27 Jan 2007 01:53:45 -0000

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

Change 113587 by zec@zec_tca51 on 2007/01/27 01:52:46

	Comment out an assert that is not valid in VIMAGE kernels,
	since we don't track interface unit numbers via bitmaps.

Affected files ...

.. //depot/projects/vimage/src/sys/net/if_clone.c#4 edit

Differences ...

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

@@ -442,12 +442,12 @@
 		goto done;
 	}
 
+#ifndef VIMAGE
 	if (!wildcard) {
 		bytoff = *unit >> 3;
 		bitoff = *unit - (bytoff << 3);
 	}
 
-#ifndef VIMAGE
 	if((ifc->ifc_units[bytoff] & (1 << bitoff)) != 0) {
 		err = EEXIST;
 		goto done;
@@ -469,9 +469,9 @@
 void
 ifc_free_unit(struct if_clone *ifc, int unit)
 {
+#ifndef VIMAGE
 	int bytoff, bitoff;
 
-
 	/*
 	 * Compute offset in the bitmap and deallocate the unit.
 	 */
@@ -483,6 +483,7 @@
 	    ("%s: bit is already cleared", __func__));
 	ifc->ifc_units[bytoff] &= ~(1 << bitoff);
 	IF_CLONE_REMREF_LOCKED(ifc);	/* releases lock */
+#endif
 }
 
 void