From owner-svn-src-all@FreeBSD.ORG  Thu Apr 23 21:19:35 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 883B3106564A;
	Thu, 23 Apr 2009 21:19:35 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7741A8FC15;
	Thu, 23 Apr 2009 21:19:35 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3NLJZ3s099624;
	Thu, 23 Apr 2009 21:19:35 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3NLJZd0099623;
	Thu, 23 Apr 2009 21:19:35 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200904232119.n3NLJZd0099623@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 23 Apr 2009 21:19:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191440 - head/sys/dev/e1000
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Apr 2009 21:19:35 -0000

Author: kmacy
Date: Thu Apr 23 21:19:35 2009
New Revision: 191440
URL: http://svn.freebsd.org/changeset/base/191440

Log:
  Make sure the ALTQ case is handle correctly by using drbr_dequeue

Modified:
  head/sys/dev/e1000/if_em.c

Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c	Thu Apr 23 21:09:47 2009	(r191439)
+++ head/sys/dev/e1000/if_em.c	Thu Apr 23 21:19:35 2009	(r191440)
@@ -1076,7 +1076,7 @@ em_start_locked(struct ifnet *ifp)
 	while ((adapter->num_tx_desc_avail > EM_TX_OP_THRESHOLD)
 	    && (!ADAPTER_RING_EMPTY(adapter))) {
 
-		m_head = buf_ring_dequeue_sc(adapter->br);
+		m_head = drbr_dequeue(adapter->br);
 		if (m_head == NULL)
 			break;
 		/*