From nobody Thu Oct 24 13:04:09 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 4XZ5hp0Cbdz5bRKm; Thu, 24 Oct 2024 13:04:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ5hn6nrCz47rt; Thu, 24 Oct 2024 13:04:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729775050; 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=xoUG7MK0ajVQeLVjmuDLxJoJNNk82HTYmDTx2nQu61g=; b=hwFmOVKdbZ4lhE0vFJrf5QNYICZ9tLV9fAdiNjZ0U6jElj8lSqeaYrGLJLjM129Drhs1SZ nA82vHdLBHIpABs6+KDCynkgh3MbrkNnLZALSDCZUA202AVihJ6xs0P76W7upl0vVnzuEF UDCmVBt6qX/vbv9LbcD27RzM3VB/NO6LAH2mip/KreV9FL/P6PLSuIE/rVhCTG/fEJFcdJ lGwfPlCFhuEPJYJqmrHz/bHe6TpYQArtcFqoMR/CSm//gavvmcnMVunhFhx6C4iCx850d/ XQosPogv/Qo4DNY1YI4fBl5iJpVOOnn0dJ+suuZGji3ytNV2BxNlxNNC5AF0FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729775050; 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=xoUG7MK0ajVQeLVjmuDLxJoJNNk82HTYmDTx2nQu61g=; b=P7KQwfeVIxPLqIoX3NwlWIo33dY6ATPTw0JmJYg9D5A0VgdUFWJYJ8BN/3K/2832VunxYl FBHwNJs4qP2ImkEMpLFmaq6jXy8oXSiuzHvZlnz/d68GGbqtQGu673ivGyj/vykCN5fzOO dIPsYvl78WPnRJUc+RbvUks9nMeVAeGFacUX/xpK+HWHhWRZEOnI0+n1X8LJvsLO8X7EWg WG3hZO3J+e5aUz7JtDfouQlqZ4Yg3R2/2SbxWHzTbtN8HJkaT1BV/qwt4TfU0Sf2N13ymJ kEAOsDTNLcerSk5m8zcmauxRfnH9WWo9zmHIAm0jaawKymsw9bdcqEBPQurSRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729775050; a=rsa-sha256; cv=none; b=i7m4h/7o1lkVUj3keYfBE7DGLkcRSp7G3O4Ae8Db91wZX+XtC4JZOuJKmqjcy8oDoSHcUe CqKnZ2kLb8XybEU82quH2ATTMi7KmCocl32YVr8lP9c4CD5IPl7aDB+7OFJhOoynM/q22p uePwUJdKE0JQdI0Yg0tAASqlzdjO17EM4/dazOo7ReNwIQu2iSLnWQ/rLTbnVbCC/GaUII ol0/+doaRURScc9j0xOdIvKv02tVTcd6bW8Crtzo8KOHLe7r4VfZw46/z26xt2pnn8WcH6 OHdrcEJ5PWyshlLdxeeLLFsvRmOPE0JJw9qSeSYW5UgV4xwafdDvH3/e5/GMvQ== 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 4XZ5hn6NtMzk1K; Thu, 24 Oct 2024 13:04:09 +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 49OD49IP038701; Thu, 24 Oct 2024 13:04:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OD49xk038698; Thu, 24 Oct 2024 13:04:09 GMT (envelope-from git) Date: Thu, 24 Oct 2024 13:04:09 GMT Message-Id: <202410241304.49OD49xk038698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e4ac0183a1a8 - main - 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: 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/main X-Git-Reftype: branch X-Git-Commit: e4ac0183a1a846ef6556c9876dab76c06f5fea9c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e4ac0183a1a846ef6556c9876dab76c06f5fea9c commit e4ac0183a1a846ef6556c9876dab76c06f5fea9c Author: Michael Tuexen AuthorDate: 2024-10-24 11:24:49 +0000 Commit: Michael Tuexen CommitDate: 2024-10-24 11:24:49 +0000 sctp: cleanup No functional change intended. MFC after: 3 days --- sys/netinet/sctp_pcb.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 92f08717c001..f25668b5756c 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -192,21 +192,17 @@ sctp_find_ifn(void *ifn, uint32_t ifn_index) struct sctp_ifn *sctp_ifnp; struct sctp_ifnlist *hash_ifn_head; - /* - * We assume the lock is held for the addresses if that's wrong - * problems could occur :-) - */ SCTP_IPI_ADDR_LOCK_ASSERT(); hash_ifn_head = &SCTP_BASE_INFO(vrf_ifn_hash)[(ifn_index & SCTP_BASE_INFO(vrf_ifn_hashmark))]; LIST_FOREACH(sctp_ifnp, hash_ifn_head, next_bucket) { if (sctp_ifnp->ifn_index == ifn_index) { - return (sctp_ifnp); + break; } - if (sctp_ifnp->ifn_p && ifn && (sctp_ifnp->ifn_p == ifn)) { - return (sctp_ifnp); + if (ifn != NULL && sctp_ifnp->ifn_p == ifn) { + break; } } - return (NULL); + return (sctp_ifnp); } struct sctp_vrf *