Date: Fri, 5 Jun 2009 23:27:27 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r193546 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb Message-ID: <200906052327.n55NRRq4041384@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Fri Jun 5 23:27:27 2009 New Revision: 193546 URL: http://svn.freebsd.org/changeset/base/193546 Log: only pass ci.count if we're doing a a batch transmit Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Fri Jun 5 23:23:24 2009 (r193545) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Fri Jun 5 23:27:27 2009 (r193546) @@ -1555,9 +1555,10 @@ cxgb_start_locked(struct sge_qset *qs) check_pkt_coalesce(qs); count = 1; - if (sc->tunq_coalesce) + if (sc->tunq_coalesce) { m_head = cxgb_dequeue_chain(qs, &ci); - else + count = ci.count; + } else m_head = TXQ_RING_DEQUEUE(qs); if (m_head == NULL) @@ -1566,7 +1567,7 @@ cxgb_start_locked(struct sge_qset *qs) * Encapsulation can modify our pointer, and or make it * NULL on failure. In that event, we can't requeue. */ - if (t3_encap(qs, &m_head, ci.count)) + if (t3_encap(qs, &m_head, count)) break; /* Send a copy of the frame to the BPF listener */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906052327.n55NRRq4041384>