Date: Tue, 18 Dec 2018 17:31:31 +0000 (UTC) From: Stephen Hurd <shurd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r342194 - stable/12/sys/net Message-ID: <201812181731.wBIHVVmw047246@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: shurd Date: Tue Dec 18 17:31:31 2018 New Revision: 342194 URL: https://svnweb.freebsd.org/changeset/base/342194 Log: MFC r341824: 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 Sponsored by: Limelight Networks Modified: stable/12/sys/net/iflib.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/net/iflib.c ============================================================================== --- stable/12/sys/net/iflib.c Tue Dec 18 17:17:53 2018 (r342193) +++ stable/12/sys/net/iflib.c Tue Dec 18 17:31:31 2018 (r342194) @@ -3798,7 +3798,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?201812181731.wBIHVVmw047246>