From nobody Thu Oct 31 14:04:15 2024 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 4XfQhv3z5mz5bm2x; Thu, 31 Oct 2024 14:04:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XfQhv3FCSz43cC; Thu, 31 Oct 2024 14:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730383455; 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=GQD33K6ou5cpbXswexT5T8MJIMs6lv9Mh4YTtEIkMlk=; b=JrrBxhKN3SCxydFqfgMIntO/QoG+Gvv0QtaEGLihQ7btcy7etzbJmp9/6YoAj9ZCageh5+ nzlcaqj4txL5DIe+HZC3yLtCQowJTqB6YBLoFG3lNBzNFrqY6ARxmgVK48okoGewsov8J7 qeWgSGTQF0dSkLAWqLoIo6PuURAmBaaxka+7Nw32QNEfofFA80u3ffJHe48Bi3L36qXo2z XgjE0jdUaZmCFEFWz2gedVBrT32Lo67pOl1jb7i5WMJd///cYlv4kctCpSfm+ZRlqfPy5f xuij/EnD+aAQuN8HNcQdLaa2dYbb9D8cVaydQThYqUaxRyhAprYVDJbkZhp3Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730383455; 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=GQD33K6ou5cpbXswexT5T8MJIMs6lv9Mh4YTtEIkMlk=; b=mjwevqRJXOcmTfjwVPZzus0SOc/gTdoAAoqmvW/ef5zrkAVCjEF1ppCGsICChpgkk5dmFJ /TPpPyoxzYCAPs7/QZEm0hW9k3d+O/NZesZLEjtLB/fS9wYc8EmhAfffNt1xoj9ss7VhFB Zy2Fgn6QNy7jM19/zoB3jhaI13byDLOtKfkEwm1Lz8m7MlxlsuYVsHnPa0sdfMeCHSwY87 XfP9kzXdfursCpDUqROXX9FuFcHuCpVQkuoR55tX20RqJ2i4IIKWo/1LVqFQI+YqVhLfxr u4IgXKNdE6SsIXXAJ6xM5YgXyHDM1Oj8svKa55ezvdXoiMs3RnvOWnM76nHPKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730383455; a=rsa-sha256; cv=none; b=RNtajjEIvtViSpUhRz9YIa/ePQMv/NEbCcmhZZGXiAQ/FlSEvPC6vFMwnvDK1hKFq4d8jD eq57Avoq9YmFAv00G+xbDPGPCyGpAF5V2OxbjcRr4kRZv/RidqgeplBGyF4MV1KI8e9YiA Qcv3xwx62YDpJMGWwZkaAMv22WcI8h7sQFxJeNaWZld/Eu32U9TS7qZTEkS3m5x/hQ3htu 010EwMPTyclCkJ5rOw+ptW6G1X3rlt6rPkEtbTm7ecMD5IbMFm44AEHQISLLdVjRFkiMmB W/o+BXe4eOqsTqbY6LtN7ETOKf3W4+hQbllW8PqDSHvMe1OcrDn0Ga2kAcaVdA== 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 4XfQhv2Y34zfY2; Thu, 31 Oct 2024 14:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49VE4FTm049768; Thu, 31 Oct 2024 14:04:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VE4Fcg049765; Thu, 31 Oct 2024 14:04:15 GMT (envelope-from git) Date: Thu, 31 Oct 2024 14:04:15 GMT Message-Id: <202410311404.49VE4Fcg049765@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: 676b45d04b60 - stable/14 - sctp: further 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 676b45d04b60c59f813d5bd385954c4a820c5840 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=676b45d04b60c59f813d5bd385954c4a820c5840 commit 676b45d04b60c59f813d5bd385954c4a820c5840 Author: Michael Tuexen AuthorDate: 2024-10-25 11:47:43 +0000 Commit: Michael Tuexen CommitDate: 2024-10-31 11:42:52 +0000 sctp: further cleanup (cherry picked from commit 02478e65910ab1ef53511ebb2271cdcf0e9a14cf) --- sys/netinet/sctp_pcb.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 3665b8e2f211..d32be9c791a9 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -455,7 +455,6 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, struct sctp_ifalist *hash_addr_head; struct sctp_ifnlist *hash_ifn_head; uint32_t hash_of_addr; - int new_ifn_af = 0; #ifdef SCTP_DEBUG SCTPDBG(SCTP_DEBUG_PCB4, "vrf_id 0x%x: adding address: ", vrf_id); @@ -519,7 +518,6 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, LIST_INSERT_HEAD(hash_ifn_head, sctp_ifnp, next_bucket); LIST_INSERT_HEAD(&vrf->ifnlist, sctp_ifnp, next_ifn); atomic_add_int(&SCTP_BASE_INFO(ipi_count_ifns), 1); - new_ifn_af = 1; } sctp_ifap = sctp_find_ifa_by_addr(addr, vrf->vrf_id, SCTP_ADDR_LOCKED); if (sctp_ifap) { @@ -529,7 +527,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, SCTPDBG(SCTP_DEBUG_PCB4, "Using existing ifn %s (0x%x) for ifa %p\n", sctp_ifap->ifn_p->ifn_name, ifn_index, (void *)sctp_ifap); - if (new_ifn_af) { + if (new_sctp_ifnp == NULL) { /* Remove the created one that we don't want */ sctp_delete_ifn(sctp_ifnp); } @@ -597,8 +595,8 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, sctp_ifap->src_is_priv = 1; } sctp_ifnp->num_v4++; - if (new_ifn_af) - new_ifn_af = AF_INET; + if (new_sctp_ifnp == NULL) + sctp_ifnp->registered_af = AF_INET; break; } #endif @@ -617,13 +615,12 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, sctp_ifap->src_is_priv = 1; } sctp_ifnp->num_v6++; - if (new_ifn_af) - new_ifn_af = AF_INET6; + if (new_sctp_ifnp == NULL) + sctp_ifnp->registered_af = AF_INET6; break; } #endif default: - new_ifn_af = 0; break; } hash_of_addr = sctp_get_ifa_hash_val(&sctp_ifap->address.sa); @@ -639,9 +636,6 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, sctp_ifnp->ifa_count++; vrf->total_ifa_count++; atomic_add_int(&SCTP_BASE_INFO(ipi_count_ifas), 1); - if (new_ifn_af) { - sctp_ifnp->registered_af = new_ifn_af; - } SCTP_IPI_ADDR_WUNLOCK(); if (new_sctp_ifnp != NULL) { SCTP_FREE(new_sctp_ifnp, SCTP_M_IFN);