From nobody Fri Sep 15 17:33:06 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 4RnLr30243z4tNr9; Fri, 15 Sep 2023 17:33:07 +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 4RnLr26jCSz3GlH; Fri, 15 Sep 2023 17:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799186; 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=4qfQcOGUeMBZgkU3NsycHwPcZ/UpPr6pehn5bid+0D8=; b=nrQyLccIY8RyqZZCmneVp5B0jgiobVOLIY1dhPnrQ7L+XBBCAAoTWsRacNHpgIPrdAMg4j iTDG1XhZhMPeEovyeedkcU9Qn7O6kTj/oAlZiaK9JF58/VkhJJELKGkecAERiLKbTITiRg vhh0A4rj1X4RhJevNYOIzaI6zUknOIMal56H2aFMQbGANqEsvtg+S1je9vUEoMRELEiUWs K1LMYJJ1IC+wpRncan2uveDHpzEAQOWglBpLZTxDNhNXuuZrO5hpvMJ/dIDro/x+95Y6TY V7O6caNVhKA2/CO9OfSxL1pTPIbK3JkztdjH1sUNSWPkpu5gp6HMOwd4XBhJ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799186; a=rsa-sha256; cv=none; b=j/YZPpqgXDa8EoEgV1wYFbwJO+BteUxOZuDtnAV5LGILWntgSQY+3mTxa3Fu+62pVl4YJE ag4aLS5EEHIJ9smoojuPTTOPTFKX1Ygggo9HZoORyokBKz43Gi8O5TDwtz/H6M2O7f2WBh sZzJHSG1Stx4BKgQC68XEx4S74mG61xdtisAjdS7ATKHVsm8/lKgMKWSePz9pFL12jxK2x CGtb8BKRzNqb5IWGqTnDcg03A4y+aDNlFfaHnWjdbSRXYrC6PjuvxrFEDivDwtUFLuYRbY qt3Dy1YPY2Rb6tBNx9+gnOuWW9aVUMwowWMVbfTyuilgKDWnsQYyeEl62zpeUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799186; 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=4qfQcOGUeMBZgkU3NsycHwPcZ/UpPr6pehn5bid+0D8=; b=Pk+lzcoCxHqGGQMt9DeQnD/cQhO8e+QDOXXAyHuR55Ro2PcO5kYtCQg8ZtKAIJ+U7FTxOx 11FxNnx+WmKVbUMPsHpTriv2gYWEEzszqkpHo+p2mFpcKEU6aTBtJfeXAHMkhi78h2Sz5I NYT3MNztSnpmmTqzHaWj+OBfJuIPY1IT3Zh+FsjOMbdLCg5n2vmSKusQnzIjdDCdNvEbEL JCteAcS8QMSjpBtA8CZiYE1vTl0EFsZqZ7DMrkt2hl4xXDtLllHg0gZoLQ6pQbM7lQVWS/ mYGWK8a1UE4LYKgUM0XSHHyBS2kDYKgnb95ZqnUN1SUCWyjrpH9joAkqa9JPbA== 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 4RnLr25mGWzY8X; Fri, 15 Sep 2023 17:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FHX619038847; Fri, 15 Sep 2023 17:33:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHX6tq038844; Fri, 15 Sep 2023 17:33:06 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:33:06 GMT Message-Id: <202309151733.38FHX6tq038844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 351792d4cfd1 - stable/14 - sctp: cleanup 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 351792d4cfd1a7f7337472870f207004789db2a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=351792d4cfd1a7f7337472870f207004789db2a4 commit 351792d4cfd1a7f7337472870f207004789db2a4 Author: Michael Tuexen AuthorDate: 2023-08-25 15:23:34 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:30:51 +0000 sctp: cleanup No functional change intended. Just asserting the conditions when being called. --- sys/netinet/sctp_timer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c index ef5eb8b89a5d..d0f3f936b34d 100644 --- a/sys/netinet/sctp_timer.c +++ b/sys/netinet/sctp_timer.c @@ -87,7 +87,10 @@ static int sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct sctp_nets *net, uint16_t threshold) { - if (net) { + KASSERT(stcb != NULL, ("stcb is NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + + if (net != NULL) { net->error_count++; SCTPDBG(SCTP_DEBUG_TIMER4, "Error count for %p now %d thresh:%d\n", (void *)net, net->error_count, @@ -114,11 +117,6 @@ sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb, sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net); } } - } - if (stcb == NULL) - return (0); - - if (net) { if ((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) { if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) { sctp_misc_ints(SCTP_THRESHOLD_INCR,