From owner-p4-projects@FreeBSD.ORG  Thu Feb 19 17:37:34 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 78F0D1065674; Thu, 19 Feb 2009 17:37:34 +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 23D081065678;
	Thu, 19 Feb 2009 17:37:34 +0000 (UTC) (envelope-from zec@icir.org)
Received: from labs4.cc.fer.hr (labs4.cc.fer.hr [161.53.72.24])
	by mx1.freebsd.org (Postfix) with ESMTP id A971D8FC15;
	Thu, 19 Feb 2009 17:37:32 +0000 (UTC) (envelope-from zec@icir.org)
Received: from sluga.fer.hr (sluga.cc.fer.hr [161.53.72.14])
	by labs4.cc.fer.hr (8.14.2/8.14.2) with ESMTP id n1JHP4On020228;
	Thu, 19 Feb 2009 18:25:05 +0100 (CET)
Received: from [192.168.200.100] ([161.53.19.79]) by sluga.fer.hr with
	Microsoft SMTPSVC(6.0.3790.3959); Thu, 19 Feb 2009 18:24:37 +0100
From: Marko Zec <zec@icir.org>
To: Julian Elischer <julian@freebsd.org>
Date: Thu, 19 Feb 2009 18:24:29 +0100
User-Agent: KMail/1.9.10
References: <200902191710.n1JHAT4W092138@repoman.freebsd.org>
In-Reply-To: <200902191710.n1JHAT4W092138@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-2"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200902191824.30353.zec@icir.org>
X-OriginalArrivalTime: 19 Feb 2009 17:24:37.0582 (UTC)
	FILETIME=[F0A506E0:01C992B6]
X-Scanned-By: MIMEDefang 2.64 on 161.53.72.24
Cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: 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:37:35 -0000

On Thursday 19 February 2009 18:10:29 Julian Elischer wrote:
> 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

Thanks!

Amazingly epair now really works with vimages!  Though, all cloned 
instances always have the same unit number (0)...


> 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) {