From 0d707bd5b6ee2c32b11affb0dbb74330109296f8 Mon Sep 17 00:00:00 2001 From: Gordon Tetlow Date: Tue, 9 Jun 2020 16:11:54 +0000 Subject: [PATCH] Fix iflib watchdog timeout resetting idle queues. Approved by: so Security: FreeBSD-EN-20:12.iflib --- sys/net/iflib.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 1e248c00c80..0d7df624082 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -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 -- 2.45.0