From nobody Sun Apr 09 21:35:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvllW6h8bz44Jpj; Sun, 9 Apr 2023 21:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PvllW2hG3z4NG4; Sun, 9 Apr 2023 21:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aTSGJujJJBop5PHfOUzNx8lsQpGAD5x74uLMxqxidpM=; b=QpZcaYj3t2GcD/O1CPoZFFzO9uaFRlXLQL5U8lDXg9rm7fLX1ap7vyzeFE0o3hwEbIQFSq SmhVqLTPN5qTHcD61PZImhSQiR/i6bFEMaFzqu2yHF9qPoNkBs4FLmBacQ4lVZhbA0fQfe B8bxOLrqnGXqRvitNf0DiD6eroT2Zi0Ff2Xv37aRZ/E1+2eI6+xceDBUDK8H6QnlEmqwLs BiPNuP/6cA3hPFuTX3SRGcLl7SuaoB/Q9f/K6k5yIY+5Vrq0HWXeSlLtmPbWvcuxgZE8MS xWsQedhQwzvRtNQ2y+k3q6kpV2fbs7VTBsf46bRkt/weGM0sTHUe6giC7E25JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aTSGJujJJBop5PHfOUzNx8lsQpGAD5x74uLMxqxidpM=; b=oVA5Cqi1p+AiLTEWhzwNhic0rzz2xUNZL2/Cw6wHD2phUuCFGaGefY1KlVlC2EPFdNmfSG a3Kz+lSh2nEUsRjhu+cgcilpvFI88hY4knjiHm90blzhmA6s51eXGXOWYCQ4/5jxjJ65b+ PhpD90hegUO8tOVwmt8ty5ft7xgIslqrJNoGl8yCwHRhT/oXEt7PoGWQS0t8APVXTbasld /FV6U6haIv12Dyf3cdLaYrXsqzMlKa/PtYfl7/toXbby+ztx5lhSMYDfw55koFu+cyQRCP akzu3TawQrgzlxmo2wAqEgap9wDC0eG3vhtOMgHt5ljSFmSqflCnS/L2Tb65cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681076151; a=rsa-sha256; cv=none; b=smhT/S71BUsqmIyEvUNX22EeKfhUFkTlNGTSKzbOLtWVfbnGTd87Sqq+idLQIRdiutfptr fsxn5hpNH7oo4oVj24UVsSQNZ63G0ZJg2s/n0y2GJfoo2Rck9mIQAKcibHTY9uewjXfttU 3KkQzgLFgqqUWwTTDfHrbtu+bx6JrsClSvfQ2IbID3yqc1S1bEfCSlLKpBJcWRNAxS0U0X NlHbOcJxUEhjjL/qvytQ0OcBdx/zBNPFCqwmgkItdOFLPzmoQJppKho7jOGAUaIVH62ifU w9JbvlFUJz7Op21osCth9+qFdq6W6UCMQJyt0XT1Mq2ZG/FZoI5OBG2d7erxrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PvllV5lN0zPkp; Sun, 9 Apr 2023 21:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 339LZomK082164; Sun, 9 Apr 2023 21:35:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339LZocQ082163; Sun, 9 Apr 2023 21:35:50 GMT (envelope-from git) Date: Sun, 9 Apr 2023 21:35:50 GMT Message-Id: <202304092135.339LZocQ082163@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 442f26c2bccc - stable/13 - sctp: tweak panic message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 442f26c2bccc754be1f9c725181b13ff7600310c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=442f26c2bccc754be1f9c725181b13ff7600310c commit 442f26c2bccc754be1f9c725181b13ff7600310c Author: Michael Tuexen AuthorDate: 2022-08-03 15:28:15 +0000 Commit: Dimitry Andric CommitDate: 2023-04-09 20:20:13 +0000 sctp: tweak panic message MFC after: 1 week (cherry picked from commit 979bc32c7c14f944a340058fcd1a580a7492f785) --- sys/netinet/sctp_indata.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index aa6787257a13..b8bfaf164904 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -3837,10 +3837,9 @@ static int sctp_fs_audit(struct sctp_association *asoc) { struct sctp_tmit_chunk *chk; - int inflight = 0, inbetween = 0; + int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0; int ret; #ifndef INVARIANTS - int resend = 0, acked = 0, above = 0; int entry_flight, entry_cnt; #endif @@ -3860,19 +3859,13 @@ sctp_fs_audit(struct sctp_association *asoc) chk->snd_count); inflight++; } else if (chk->sent == SCTP_DATAGRAM_RESEND) { -#ifndef INVARIANTS resend++; -#endif } else if (chk->sent < SCTP_DATAGRAM_ACKED) { inbetween++; } else if (chk->sent > SCTP_DATAGRAM_ACKED) { -#ifndef INVARIANTS above++; -#endif } else { -#ifndef INVARIANTS acked++; -#endif } }