Date: Sat, 6 Jun 2009 00:26:49 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r193553 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb Message-ID: <200906060026.n560Qnfx042799@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Sat Jun 6 00:26:49 2009 New Revision: 193553 URL: http://svn.freebsd.org/changeset/base/193553 Log: further simplify coalesce_check 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 Sat Jun 6 00:08:19 2009 (r193552) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Sat Jun 6 00:26:49 2009 (r193553) @@ -1492,7 +1492,6 @@ struct coalesce_info { int nbytes; }; - static int coalesce_check(struct mbuf *m, void *arg) { @@ -1500,17 +1499,12 @@ coalesce_check(struct mbuf *m, void *arg int *count = &ci->count; int *nbytes = &ci->nbytes; - if (*nbytes == 0) { - *count = 1; - return (1); - } else if ((m->m_next != NULL) || (*count > 6)) - return (0); - else if (*nbytes + m->m_len <= 10500) { + if ((*nbytes + m->m_len <= 10500) && (*count < 7) && + (m->m_next == NULL)){ *count += 1; *nbytes += m->m_len; return (1); } - return (0); } @@ -1520,7 +1514,7 @@ cxgb_dequeue_chain(struct sge_qset *qs, struct mbuf *m, *m_head, *m_tail; m_head = m_tail = NULL; - ci->nbytes = 0; + ci->count = ci->nbytes = 0; do { m = TXQ_RING_DEQUEUE_COND(qs, coalesce_check, &ci); if (m_head == NULL) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906060026.n560Qnfx042799>