From nobody Wed Feb 23 00:16:26 2022 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 DA5A519D4D2F; Wed, 23 Feb 2022 00:16:26 +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 4K3GmV5kFVz4YnF; Wed, 23 Feb 2022 00:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645575386; 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=SX5JBy7PUY/koa5Q/JQz23tLFmS4nP2H5gUkt207WGw=; b=dp5l36MHVgcrJ3qeyQC5f40vIpG4DparkIqmP8yKkTnBv/QN/vcXppfDRpylTcw1hxcSTI K6/l678TVlp0vxmkEzbEeiQbgC1NzrMx+w+A1fkOEOvWJHQpcrsMYqBTivFGnbfBScUDjq NohPM5wIeHZF82WisSo3fb96S6TsrdTHF7XaU48I2UEIwlwb0vF7geeWznXrvOiVSoYpf2 amsg2EGv10GwNMigJ/WE8sooaU4wJZv5Q+gp9k29APoCRaNBxfw3cEsljTv/MnaMF2X6JN bAaiF80LVzuGdzXIk+f27Ia6fOBVEO/DlQpDsyiLr+pwQblAydePcN24q72NWg== 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 A51BA636E; Wed, 23 Feb 2022 00:16:26 +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 21N0GQON079407; Wed, 23 Feb 2022 00:16:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21N0GQCM079406; Wed, 23 Feb 2022 00:16:26 GMT (envelope-from git) Date: Wed, 23 Feb 2022 00:16:26 GMT Message-Id: <202202230016.21N0GQCM079406@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: 5871b7c81a46 - stable/13 - sctp: remove unused parameter 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/13 X-Git-Reftype: branch X-Git-Commit: 5871b7c81a46ddfd6db8acd8d6813f76d122fb5b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645575386; 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=SX5JBy7PUY/koa5Q/JQz23tLFmS4nP2H5gUkt207WGw=; b=EUmmKhB6fKkS38rvcgtSrhoJnhLeXBOjxQkKx/jWzaF6/+LxsV6Honheq+OgRBgP+aIt7+ USZq1YcRv1YlFsWgMSqfsnVWZs++Z6mRVlLYF6e7u0ssDqv7WqqD21HlEy+J11DyTPMNl3 RrZ+2maFlb7F2KeJiy4iVte4FR2d4SvTxb1oAfrcVu0l0bYYh+kDxJ/J0yFVHwxKSttyEc zTmjHsobjw5TGQ4omHVcHJpIEny3LHhEF++soeCinR6OXsQ4XAwcEc1tP9e5K1K2SVL0Cq lsTEIZxepoBsDWb3PMPi58mKS57FcChX7oCVHs1JkoYV1AieXPHW+k/kGDCBqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645575386; a=rsa-sha256; cv=none; b=qNYAPPAVvL13E5EsSDpDzSMHdwvAo3zCb7NC5TEQdQSnBk9Dk+4wXdi8t5a7EsH1uPLz3g DxHOGa1aQ6QiB5oECvNCulbKKl9W9Vdkh8JDIMttTR/rMqMlb4JtD+6isc8N03bxAQqRyr Al7CKF6PhI8hBmK8qzMem86AzWQqzuCmmqO6lZCVvM0NCu3rkxv+Anan7ycAcBBBOKt8cy kLhamnD9uX0KZPdzJx6wM6kSkjTI1cJ4h+kaiC8fCstLuuIwJPzRqVAgBMXDbY7ISsVWv7 nhRsSvdNr0Nl5dx3sD7EtCkd4NoxGJzQ5paeG0zPX0Hos6q0HyTMWfJi8lhQHg== 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=5871b7c81a46ddfd6db8acd8d6813f76d122fb5b commit 5871b7c81a46ddfd6db8acd8d6813f76d122fb5b Author: Michael Tuexen AuthorDate: 2022-02-18 11:20:44 +0000 Commit: Michael Tuexen CommitDate: 2022-02-23 00:14:53 +0000 sctp: remove unused parameter (cherry picked from commit 3ca204c97aa74a6509ccf59ff421fed2e9a11d4f) --- sys/netinet/sctp_os_bsd.h | 2 +- sys/netinet/sctp_pcb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index 39c0a8cb5c2a..4d2c40b59a4b 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -313,7 +313,7 @@ typedef struct callout sctp_os_timer_t; /*************************/ /* MTU */ /*************************/ -#define SCTP_GATHER_MTU_FROM_IFN_INFO(ifn, ifn_index, af) ((struct ifnet *)ifn)->if_mtu +#define SCTP_GATHER_MTU_FROM_IFN_INFO(ifn, ifn_index) ((struct ifnet *)ifn)->if_mtu #define SCTP_GATHER_MTU_FROM_ROUTE(sctp_ifa, sa, nh) ((uint32_t)((nh != NULL) ? nh->nh_mtu : 0)) #define SCTP_GATHER_MTU_FROM_INTFC(sctp_ifn) ((sctp_ifn->ifn_p != NULL) ? ((struct ifnet *)(sctp_ifn->ifn_p))->if_mtu : 0) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 23bef0ebaf05..632da61f6cf6 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -535,7 +535,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, sctp_ifnp->refcount = 0; sctp_ifnp->vrf = vrf; atomic_add_int(&vrf->refcount, 1); - sctp_ifnp->ifn_mtu = SCTP_GATHER_MTU_FROM_IFN_INFO(ifn, ifn_index, addr->sa_family); + sctp_ifnp->ifn_mtu = SCTP_GATHER_MTU_FROM_IFN_INFO(ifn, ifn_index); if (if_name != NULL) { SCTP_SNPRINTF(sctp_ifnp->ifn_name, SCTP_IFNAMSIZ, "%s", if_name); } else {