From nobody Fri Feb 18 16:15:19 2022 X-Original-To: dev-commits-src-main@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 413D919CA973; Fri, 18 Feb 2022 16:15:20 +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 4K0cHD1HfMz3nQ3; Fri, 18 Feb 2022 16:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645200920; 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=6JfAUG0Pq2pEnDm0P0cu/oOal+UUpxrz/snf8xu/71g=; b=iJ4kZhQZjjocB+eQaGqyrAx8lSW41a8lfnnsxqMyAGQhyPcZ6B0wvmz02cJ7S4Wz0qF1T0 Z6Tjix1DejcGDiVnx07oyJMy5At/l7vbYGtKwEjdH9Sqy3szlfZkCyLLBBXAiWsWDdDtIl nqglxVyrcXoQx1KnLHdoYitAUmYIvesDYxUqKAPuJTZB6+mb7MR6PyQOHm5D22fzFZqMz3 mDd3BVT2n1Szk/PDrvP60opKU0t6UZu95ELOc5xJ/YSYfmmPRDDsdchgzQzF7PWX9iaFJi LORC+aJ9GuFFHiwRwentQ8urvQqy9icAnmseOqlwi88y0givZl1yRBoRD3sMfA== 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 0409820936; Fri, 18 Feb 2022 16:15:20 +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 21IGFJ1I086416; Fri, 18 Feb 2022 16:15:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21IGFJlT086415; Fri, 18 Feb 2022 16:15:19 GMT (envelope-from git) Date: Fri, 18 Feb 2022 16:15:19 GMT Message-Id: <202202181615.21IGFJlT086415@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: 274a0e4a8d81 - main - sctp: cleanup, no functional change intended. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 274a0e4a8d817d88ce7e3d40c4aad71db102c6ff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645200920; 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=6JfAUG0Pq2pEnDm0P0cu/oOal+UUpxrz/snf8xu/71g=; b=dcQCrKzCffdm1RH/ijTQVM6UeK8mw6+WVSk9HhHenuOYSw0Ssx8PlbwsR1h8UAOBRVOThr qkSMAuNDR4PglHxRfqmDeWaDLJgpmbysEBvr4qHYuKL8VqRRKMtgIr4oLW33hhPK4CTWNH DfJyvmhHM61pNPsILqtgxlopbWyd4r3lRVxFh1kR0rJ4PlMXrkJB1Ananb3KNFC61qKQ+n 6zlAUBDp6/sKnhdeRbHYuY9GOy1YbnkVmnPTA02prMqVqikftfgrusc1q2d8pmjQ69etHc K1xiUCw7nBS+YB8MoEkoMWroHTReC4tI6i4zov4xJbCUc0SWoSO9Qzid5dAgdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645200920; a=rsa-sha256; cv=none; b=OH2sQIwizhAMBpvV/PWXwLnK9rfdj7l8/d62lxZgrispUm2K5WG7npxBsSZ5aAa9mQe5Wc PJn6kwS/wWartXe03hOvwaFRTEWKEVSZUUL295hY2jDGRCCFeU8FeBVfgh1Ujm3+A39RBY MHHNFhtnvWYlamegbZkUpySg0OYTAbVotcv+MzMp1bbIxAYYEp0nMwmpSjuplLUU9x6g1t b9IOP6syI/CD6Zhrx0TyiFkpQHMdehpWB2A/7lSapUX7xfAS+z9hNiQ+jf8OIEpt68v4QI d3Ep7W+PfuSxbVDrlGLAb4VD7J+hQFBGA/T0yA/cOT8cI3PdZj+RAluLzl+f/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=274a0e4a8d817d88ce7e3d40c4aad71db102c6ff commit 274a0e4a8d817d88ce7e3d40c4aad71db102c6ff Author: Michael Tuexen AuthorDate: 2022-02-18 13:20:01 +0000 Commit: Michael Tuexen CommitDate: 2022-02-18 13:20:01 +0000 sctp: cleanup, no functional change intended. MFC after: 3 days --- sys/netinet/sctp_os_bsd.h | 1 - sys/netinet/sctp_pcb.c | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index 4d2c40b59a4b..7d5cef6d5f09 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -315,7 +315,6 @@ typedef struct callout sctp_os_timer_t; /*************************/ #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) /*************************/ /* These are for logging */ diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 150039ade302..00bb25ecb96d 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -3969,7 +3969,12 @@ sctp_add_remote_addr(struct sctp_tcb *stcb, struct sockaddr *newaddr, net->src_addr_selected = 1; /* Now get the interface MTU */ if (net->ro._s_addr->ifn_p != NULL) { - imtu = SCTP_GATHER_MTU_FROM_INTFC(net->ro._s_addr->ifn_p); + /* + * XXX: Should we here just use + * net->ro._s_addr->ifn_p->ifn_mtu + */ + imtu = SCTP_GATHER_MTU_FROM_IFN_INFO(net->ro._s_addr->ifn_p->ifn_p, + net->ro._s_addr->ifn_p->ifn_index); } else { imtu = 0; }