Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Jan 2007 01:53:44 GMT
From:      Marko Zec <zec@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 113587 for review
Message-ID:  <200701270153.l0R1ri7g017236@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701270153.l0R1ri7g017236>