From nobody Tue Feb 22 22:50:56 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 295F419E6715; Tue, 22 Feb 2022 22:50:57 +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 4K3Dsr2Rq0z3QZw; Tue, 22 Feb 2022 22:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645570256; 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=violoVw5Mqsiy32w3iPKJrq7skkcB3o9AV5stlXr09Y=; b=pwvPcGoikiKIsimYtO4e7xzHCQKxA2Fc+Y+cs4df0BbOJqBdYuapHFHUlLOJCaQT9JpOSX CUm9QcdBsH3QXFtDMRoWSpTaOzsCB/oktiI45Tr1g2FxOOTynSRbmqlJA8gpO2OBUVGv+a sPFWDdaOJHMN0gtFFZ14faG/b8d1HPdsXvGx4t7LMxOzYn7IQ6u6e9a1E0bEpdzinzq4hu 9KBAyjNz7zDEpaYsGFpIdpuj4x0Vk2qjEQKdm4Iv6BFfuO8K2ceyIgpDeVuL36JZcf5tDz mke/S+G3EzkoOuejI47FANgDlSo+sgMk/U+Vq3g5oDNBnc5Yz3JmbYNLATaH2g== 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 26CD650B5; Tue, 22 Feb 2022 22:50:56 +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 21MMouku065704; Tue, 22 Feb 2022 22:50:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MMouBb065703; Tue, 22 Feb 2022 22:50:56 GMT (envelope-from git) Date: Tue, 22 Feb 2022 22:50:56 GMT Message-Id: <202202222250.21MMouBb065703@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: e79dff84b111 - stable/13 - sctp: cleanup, no functional change intended 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: e79dff84b11179dcaeb11e90f1de73235b6675f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645570256; 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=violoVw5Mqsiy32w3iPKJrq7skkcB3o9AV5stlXr09Y=; b=TzptByfs/kZxwdrqTsHm0RRCE/j96V8d9oejHnMyNQ53ttEQFIw1d/5kCCVoPln1DQ1OWX p4PywHySWtt/sDL/sZA0lk1vp6jx2I0GKAjB/bFSetVcbwR3b7cPT16kRq/7p0fRgOJKgZ hO7A6Kpsjmb5FHyGX9jqC/4zp6cPdRHZikDtOj8F4hkX697yoKaKsBRBCfnc4Y1QhWM87v aQh2LVUwweyn+JGoiZfwUDwpO37cIFNiuTmSkrZnB7cC+VwfSlja6qvql5+ZRBKTKRqXcY ptKN+5hYIuhcjWB6QL5vdIRt9uqkK73O5bzl+HufOHLeFYia33DZEExNcYegLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645570256; a=rsa-sha256; cv=none; b=kRuV23KlYc4oIdEjyuVhlgxCbp4Z3dMrxwOGl8mN346d1LFaveI5JewfnoEJPWVNnyncE+ vJ27cgnfXv97XbnaIG3bKXD7n4ySk+kH+ww+W/Yp30NSY1grIkROKkV4irxAMJRJqJucsU WeE9kWW/1Ew/DVHBZUpDRFvmg8f3mFV6qqFOYCEmRqNTLnQ7spkCEuulIFA7Fyhc+u6g3H j+aaaJeANEQb0wUCd+UZSyh6w6dRNcGfDF/u0AQv4bbuBXohpkiLQO4pnBoLliPjn/VWtr JYK7u5M+Zd/mgH7p6qvbfeDkxhKEaK8SjB9yYbcyeWdf1BBicc3px5gr3yTkcA== 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=e79dff84b11179dcaeb11e90f1de73235b6675f2 commit e79dff84b11179dcaeb11e90f1de73235b6675f2 Author: Michael Tuexen AuthorDate: 2021-09-15 08:18:11 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 22:50:33 +0000 sctp: cleanup, no functional change intended (cherry picked from commit 454216468583481746845a1c8a45a8c18898ee72) --- sys/netinet/sctp_asconf.c | 1 - sys/netinet/sctp_input.c | 5 ++--- sys/netinet/sctp_timer.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c index 0915e187ee40..2250d084ca06 100644 --- a/sys/netinet/sctp_asconf.c +++ b/sys/netinet/sctp_asconf.c @@ -2195,7 +2195,6 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, struct sctp_tcb *stcb, return; else continue; - break; } if (type == SCTP_ADD_IP_ADDRESS) { diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index aeef68899b5f..a9c5c7116e8a 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -1975,7 +1975,6 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int offset, union sctp_sockstore store; struct sctp_association *asoc; int init_offset, initack_offset, initack_limit; - int retval; int error = 0; uint8_t auth_chunk_buf[SCTP_CHUNK_BUFFER_SIZE]; @@ -2088,9 +2087,9 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int offset, return (NULL); } /* load all addresses */ - if ((retval = sctp_load_addresses_from_init(stcb, m, + if (sctp_load_addresses_from_init(stcb, m, init_offset + sizeof(struct sctp_init_chunk), - initack_offset, src, dst, init_src, port)) < 0) { + initack_offset, src, dst, init_src, port) < 0) { (void)sctp_free_assoc(inp, stcb, SCTP_NORMAL_PROC, SCTP_FROM_SCTP_INPUT + SCTP_LOC_20); return (NULL); diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c index 4866356bdf5c..e657bc280ccc 100644 --- a/sys/netinet/sctp_timer.c +++ b/sys/netinet/sctp_timer.c @@ -330,7 +330,7 @@ sctp_find_alternate_net(struct sctp_tcb *stcb, } /* Look for an alternate net, which is active. */ if ((net != NULL) && ((net->dest_state & SCTP_ADDR_BEING_DELETED) == 0)) { - alt = TAILQ_NEXT(net, sctp_next);; + alt = TAILQ_NEXT(net, sctp_next); } else { alt = TAILQ_FIRST(&stcb->asoc.nets); } @@ -369,7 +369,7 @@ sctp_find_alternate_net(struct sctp_tcb *stcb, * an alternate net, which is confirmed. */ if ((net != NULL) && ((net->dest_state & SCTP_ADDR_BEING_DELETED) == 0)) { - alt = TAILQ_NEXT(net, sctp_next);; + alt = TAILQ_NEXT(net, sctp_next); } else { alt = TAILQ_FIRST(&stcb->asoc.nets); }