From nobody Tue Feb 22 22:48:53 2022 X-Original-To: dev-commits-src-branches@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 7558919E4D77; Tue, 22 Feb 2022 22:48:54 +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 4K3DqT6Bp0z3NkR; Tue, 22 Feb 2022 22:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645570134; 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=hhIc98xj3FkE084XnY1dzWpIJKlKEu1z1m02jiTown0=; b=tcLNVzHdVTG35ub03fH28Q/Jxby4Y+ysTFkDUnoE1wSWHr8XsNLZCtTyjbEqR8edCul3v3 lbFDddzBGrFHQ50z+J+6eyn4IonMQkT2GTFWi/ECeNEw+hHEpUZFBRGavAQyvMrzkGv/FK QifZvpgpSDPPAVvhBzSwz6yXEt/asAEH0vEeSp5lFzgewee/fcdB+CBzZAhZ+q8zJwEjtZ S8vmxjCvwDtkDt9Z1OP8d+aiba0pv50nvD5+zhjDLEoZCC6JmVFS63aNNA5RPP1E8fViPS jUopVVV1FF0qe8SOrtuPUY7S5o4roB11bvcHuYrpGO4Q0kcODoDgphE3uaq4yg== 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 3E7FC4F4A; Tue, 22 Feb 2022 22:48:53 +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 21MMmrXk056178; Tue, 22 Feb 2022 22:48:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MMmrLt056177; Tue, 22 Feb 2022 22:48:53 GMT (envelope-from git) Date: Tue, 22 Feb 2022 22:48:53 GMT Message-Id: <202202222248.21MMmrLt056177@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: e24d4d533f52 - stable/13 - sctp: minor cleanup, no functional change List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: e24d4d533f520342bf579e0435781c7dd12b1531 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645570134; 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=hhIc98xj3FkE084XnY1dzWpIJKlKEu1z1m02jiTown0=; b=UMSjf/1LkFusNTmfWt7vPMgFjM5dpFJoxhl+CW3qlvGCGZXbZVBcA8b5Jc1YD7Rnj8CCGH 0lXdlRoo3mmys6O/2z8aJOdZqqqTAY2iua+IZQlbIwAjuPWU2EgTdDmRY+YjliOaSh+RT+ QLERzP5vvhvpkpC5G44BzZvm2KsM5wGpLmc6AZ/fPbI/iiWSJQu4iTcCb61F32cdOBKYTO ZvK4BpXE4KAQVUGnMKxQeBAg2+Fid7NuOF95I4APdidYu5NDDJpuMMiN3VJ3cYX5ZMSu27 bYzF+MwZxaj7IHjB8e9benpbnq/TXGjWMfeXb3nK8I+220eAmjuwFtVmJo0YPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645570134; a=rsa-sha256; cv=none; b=W7lHlztXjxFbr6GheERFpkXlLDO28nuEmNUtx74+rC5vCuq9RdzyUqQiTFJqdy1vgNA+hk GQPmZu3VOjoVPa63mvAHkN0asXcM7UMpo542/UqsNs4UlJ+Fe0BZ/Ws3/UWI290wpvRzu8 Ou+C8cwc0GPvLjOrZFulp1OgYmr+ebreDhdgKjjD9XkFLpDMqbZ//7i0A9msBdrID70W1g QGal3VSMwOTgZ8BOo7ih2RnjLq3QduuRHkRHMQvQsqNe9Dtb4Fpy8tqbWPlazdf6mHHFBE seqr5s7dKz85mD+rZieeUnU4j2WOeWdFjRFEELQzg0TZRqLS4ILz9mee+1TaQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e24d4d533f520342bf579e0435781c7dd12b1531 commit e24d4d533f520342bf579e0435781c7dd12b1531 Author: Michael Tuexen AuthorDate: 2021-09-12 17:21:15 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 22:48:24 +0000 sctp: minor cleanup, no functional change (cherry picked from commit 4181fa2a209e0709939ac2f9fb86884522855600) --- sys/netinet/sctp_pcb.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 5bbd254e3d25..6aa5e5afd678 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -6716,7 +6716,6 @@ sctp_is_vtag_good(uint32_t tag, uint16_t lport, uint16_t rport, struct timeval * { struct sctpasochead *head; struct sctp_tcb *stcb; - bool result; SCTP_INP_INFO_LOCK_ASSERT(); @@ -6740,13 +6739,10 @@ sctp_is_vtag_good(uint32_t tag, uint16_t lport, uint16_t rport, struct timeval * continue; } /* The tag is currently used, so don't use it. */ - result = false; - goto out; + return (false); } } - result = !sctp_is_in_timewait(tag, lport, rport, (uint32_t)now->tv_sec); -out: - return (result); + return (!sctp_is_in_timewait(tag, lport, rport, (uint32_t)now->tv_sec)); } static void