From owner-p4-projects@FreeBSD.ORG  Thu Feb 19 17:10:33 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 045A51065670; Thu, 19 Feb 2009 17:10:33 +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 B5574106566B
	for <perforce@freebsd.org>; Thu, 19 Feb 2009 17:10:32 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A36538FC0C
	for <perforce@freebsd.org>; Thu, 19 Feb 2009 17:10:32 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1JHAUIn092142
	for <perforce@freebsd.org>; Thu, 19 Feb 2009 17:10:30 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1JHAT4W092138
	for perforce@freebsd.org; Thu, 19 Feb 2009 17:10:29 GMT
	(envelope-from julian@freebsd.org)
Date: Thu, 19 Feb 2009 17:10:29 GMT
Message-Id: <200902191710.n1JHAT4W092138@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 157941 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: Thu, 19 Feb 2009 17:10:33 -0000

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

Change 157941 by julian@julian_trafmon1 on 2009/02/19 17:09:57

	Implement BZ's fix for altq to compile

Affected files ...

.. //depot/projects/vimage/src/sys/net/if_epair.c#5 edit

Differences ...

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

@@ -323,12 +323,12 @@
 
 #ifdef ALTQ
 	/* Support ALTQ via the clasic if_start() path. */
-	IF_LOCK(&epairinq);
+	IF_LOCK(&ifp->if_snd);
 	if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
 		ALTQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
 		if (error)
 			ifp->if_snd.ifq_drops++;
-		IF_UNLOCK(&epairinq);
+		IF_UNLOCK(&ifp->if_snd);
 		if (!error) {
 			ifp->if_obytes += len;
 			if (mflags & (M_BCAST|M_MCAST))
@@ -341,7 +341,7 @@
 		}
 		return (error);
 	}
-	IF_UNLOCK(&epairinq);
+	IF_UNLOCK(&ifp->if_snd);
 #endif
 
 	if ((epair_drv_flags & IFF_DRV_OACTIVE) != 0) {