From owner-cvs-src-old@FreeBSD.ORG  Sat Feb 13 16:05:52 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E01CD1065693
	for <cvs-src-old@freebsd.org>; Sat, 13 Feb 2010 16:05:52 +0000 (UTC)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CD2D28FC24
	for <cvs-src-old@freebsd.org>; Sat, 13 Feb 2010 16:05:52 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1DG5qgg045183
	for <cvs-src-old@freebsd.org>; Sat, 13 Feb 2010 16:05:52 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1DG5qGH045182
	for cvs-src-old@freebsd.org; Sat, 13 Feb 2010 16:05:52 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Message-Id: <201002131605.o1DG5qGH045182@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	mlaier@repoman.freebsd.org using -f
From: Max Laier <mlaier@FreeBSD.org>
Date: Sat, 13 Feb 2010 16:04:58 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/dev/cxgb cxgb_sge.c src/sys/dev/e1000 if_em.c
 if_igb.c src/sys/dev/ixgbe ixgbe.c src/sys/dev/mxge if_mxge.c
 src/sys/net if_var.h
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Feb 2010 16:05:53 -0000

mlaier      2010-02-13 16:04:58 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/cxgb         cxgb_sge.c 
    sys/dev/e1000        if_em.c if_igb.c 
    sys/dev/ixgbe        ixgbe.c 
    sys/dev/mxge         if_mxge.c 
    sys/net              if_var.h 
  Log:
  SVN rev 203834 on 2010-02-13 16:04:58Z by mlaier
  
  Fix drbr and altq interaction:
   - introduce drbr_needs_enqueue that returns whether the interface/br needs
     an enqueue operation: returns true if altq is enabled or there are
     already packets in the ring (as we need to maintain packet order)
   - update all drbr consumers
   - fix drbr_flush
   - avoid using the driver queue (IFQ_DRV_*) in the altq case as the
     multiqueue consumer does not provide enough protection, serialize altq
     interaction with the main queue lock
   - make drbr_dequeue_cond work with altq
  
  Discussed with:         kmacy, yongari, jfv
  MFC after:              4 weeks
  
  Revision  Changes    Path
  1.81      +3 -1      src/sys/dev/cxgb/cxgb_sge.c
  1.33      +1 -1      src/sys/dev/e1000/if_em.c
  1.33      +6 -2      src/sys/dev/e1000/if_igb.c
  1.25      +1 -1      src/sys/dev/ixgbe/ixgbe.c
  1.74      +1 -1      src/sys/dev/mxge/if_mxge.c
  1.166     +23 -13    src/sys/net/if_var.h