Author: gordon
Date: Tue Jun 9 16:11:54 2020
New Revision: 361971
URL: https://svnweb.freebsd.org/changeset/base/361971
Log:
Fix iflib watchdog timeout resetting idle queues.
Approved by: so
Security: FreeBSD-EN-20:12.iflib
Modified:
releng/12.1/sys/net/iflib.c
Modified: releng/12.1/sys/net/iflib.c
==============================================================================
--- releng/12.1/sys/net/iflib.c Tue Jun 9 16:10:57 2020 (r361970)
+++ releng/12.1/sys/net/iflib.c Tue Jun 9 16:11:54 2020 (r361971)
@@ -2294,8 +2294,11 @@ iflib_timer(void *arg)
(sctx->isc_pause_frames == 0)))
goto hung;
- if (ifmp_ring_is_stalled(txq->ift_br))
+ if (txq->ift_qstatus != IFLIB_QUEUE_IDLE &&
+ ifmp_ring_is_stalled(txq->ift_br)) {
+ KASSERT(ctx->ifc_link_state == LINK_STATE_UP, ("queue
can't be marked as hung if interface is down"));
txq->ift_qstatus = IFLIB_QUEUE_HUNG;
+ }
txq->ift_cleaned_prev = txq->ift_cleaned;
}
#ifdef DEV_NETMAP
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
