From owner-svn-src-head@FreeBSD.ORG Tue May 12 03:30:25 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE83F106566C; Tue, 12 May 2009 03:30:25 +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 BCF4A8FC15; Tue, 12 May 2009 03:30:25 +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 n4C3UPf7010018; Tue, 12 May 2009 03:30:25 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4C3UPhg010017; Tue, 12 May 2009 03:30:25 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905120330.n4C3UPhg010017@svn.freebsd.org> From: Kip Macy Date: Tue, 12 May 2009 03:30:25 +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: r192009 - head/sys/dev/cxgb X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 May 2009 03:30:26 -0000 Author: kmacy Date: Tue May 12 03:30:25 2009 New Revision: 192009 URL: http://svn.freebsd.org/changeset/base/192009 Log: fix bug introduced by last change Submitted by: Navdeep Parhar Modified: head/sys/dev/cxgb/cxgb_multiq.c Modified: head/sys/dev/cxgb/cxgb_multiq.c ============================================================================== --- head/sys/dev/cxgb/cxgb_multiq.c Tue May 12 02:17:25 2009 (r192008) +++ head/sys/dev/cxgb/cxgb_multiq.c Tue May 12 03:30:25 2009 (r192009) @@ -296,7 +296,7 @@ cxgb_pcpu_start_(struct sge_qset *qs, st } stopped = isset(&qs->txq_stopped, TXQ_ETH); - flush = ((drbr_empty(pi->ifp, txq->txq_mr) + flush = ((!drbr_empty(pi->ifp, txq->txq_mr) && !stopped) || txq->immpkt); max_desc = tx_flush ? TX_ETH_Q_SIZE : TX_START_MAX_DESC;