From owner-p4-projects@FreeBSD.ORG  Mon Jun  1 10:22:29 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 02AE71065674; Mon,  1 Jun 2009 10:22:29 +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 B6F681065670
	for <perforce@freebsd.org>; Mon,  1 Jun 2009 10:22:28 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A54438FC13
	for <perforce@freebsd.org>; Mon,  1 Jun 2009 10:22:28 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51AMS2N053958
	for <perforce@freebsd.org>; Mon, 1 Jun 2009 10:22:28 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51AMS8s053956
	for perforce@freebsd.org; Mon, 1 Jun 2009 10:22:28 GMT
	(envelope-from zec@fer.hr)
Date: Mon, 1 Jun 2009 10:22:28 GMT
Message-Id: <200906011022.n51AMS8s053956@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 163242 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: Mon, 01 Jun 2009 10:22:29 -0000

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

Change 163242 by zec@zec_amdx4 on 2009/06/01 10:22:27

	Fix non-critical misintegration.

Affected files ...

.. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#19 edit

Differences ...

==== //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#19 (text+ko) ====

@@ -468,11 +468,11 @@
 #endif
 #if defined(__FreeBSD__) && (__FreeBSD_version >= 500000)
 	IFNET_RLOCK();
-#endif
 	VNET_LIST_RLOCK();
 	VNET_FOREACH(vnet_iter) {
 		CURVNET_SET(vnet_iter);
 		INIT_VNET_NET(vnet_iter);
+#endif
 		for (ifp = TAILQ_FIRST(&V_ifnet); ifp;
 		    ifp = TAILQ_NEXT(ifp, if_list)) {
 			/* read from if_snd unlocked */