Date: Tue, 11 Dec 2018 17:46:01 +0000 (UTC) From: Stephen Hurd <shurd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r341824 - head/sys/net Message-ID: <201812111746.wBBHk1E2011916@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: shurd Date: Tue Dec 11 17:46:01 2018 New Revision: 341824 URL: https://svnweb.freebsd.org/changeset/base/341824 Log: Fix !tx_abdicate error from r336560 r336560 was supposed to restore pre-r323954 behaviour when tx_abdicate is not set (the default case). However, it appears that rather than the drainage check being made conditional on tx_abdicate being set, it was duplicated so it occured twice if tx_abdicate was set and once if it was not. Now when !tx_abdicate, drainage is only checked if the doorbell isn't pending. Reported by: lev MFC after: 1 week Sponsored by: Limelight Networks Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Tue Dec 11 17:39:49 2018 (r341823) +++ head/sys/net/iflib.c Tue Dec 11 17:46:01 2018 (r341824) @@ -3582,7 +3582,6 @@ _task_fn_tx(void *context) */ if (abdicate) ifmp_ring_check_drainage(txq->ift_br, TX_BATCH_SIZE); - ifmp_ring_check_drainage(txq->ift_br, TX_BATCH_SIZE); if (ctx->ifc_flags & IFC_LEGACY) IFDI_INTR_ENABLE(ctx); else {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812111746.wBBHk1E2011916>