Date: Sat, 6 Jun 2009 05:30:35 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r193565 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb Message-ID: <200906060530.n565UZqJ049458@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Sat Jun 6 05:30:34 2009 New Revision: 193565 URL: http://svn.freebsd.org/changeset/base/193565 Log: don't enqueue callout if already pending 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 05:16:04 2009 (r193564) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Sat Jun 6 05:30:34 2009 (r193565) @@ -1655,7 +1655,8 @@ cxgb_transmit_locked(struct ifnet *ifp, if (!TXQ_RING_EMPTY(qs) && pi->link_config.link_ok && (!sc->tunq_coalesce || (drbr_inuse(ifp, br) >= 7))) cxgb_start_locked(qs); - else if (!TXQ_RING_EMPTY(qs) && sc->tunq_coalesce) + else if (!TXQ_RING_EMPTY(qs) && sc->tunq_coalesce && + callout_pending(&txq->txq_timer) == 0) callout_reset_on(&txq->txq_timer, 1, cxgb_tx_timeout, qs, txq->txq_timer.c_cpu); return (0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906060530.n565UZqJ049458>