PERFORCE change 157941 for review

[Marko Zec]

On Thursday 19 February 2009 18:10:29 Julian Elischer wrote:
> http://perforce.freebsd.org/chv.cgi?CH=157941
>
> Change 157941 by julian at 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) {