From nobody Wed Mar 13 19:14:33 2024 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 4Tw0Z20cmQz5DV2N; Wed, 13 Mar 2024 19:14:34 +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 4Tw0Z206Vhz4YFx; Wed, 13 Mar 2024 19:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710357274; 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=5T/dGT/51uecTHq97Wlhgil9hHbzWZHzlHeqQaYLYpI=; b=ZFssOGNz6KmtZEYzTvoWUtFh8XgizYoyVjBpg9TkHAOxGB7Ylt+qWlmgKho9H6qcbNFOTi t4uhrxdgaSRXBSkIQBYtw/HSNlMbAAi0QkPqcuPfqpxWkiTosNaBtA0wtDZMIz9Bf0NGfm pPF943ME4RoGhmTI5o4S52GmOKTJmhB7kkyeJP4L5XRRCBhhX4tJDgeYk5FlHK5SM4i7Ea gto3bGsV85voPYwf75c/Dxk8hrkGWqVBeZJQxsWN4X7I2nKc+51qF945X1eJopj8UKR5aF kwHajtouGDypra1Xfq1KAtd3hEbB2FyNyMVkZc7j1iXdNeHdFoRQz3ylC/bAOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710357274; a=rsa-sha256; cv=none; b=IViOnC/OOim9sU5jzPn4dkIDxEyVORM6FeX3Fq1ToskanLtt8TBlEVTxaZPZzyULGHLO3D uQy1pRMZzw1lue1AiN/gUR5MRyhMn6ZyV0irzxZEBSMqHPDNJy40hJL/xjHc8hz6VoBJ5y NkiwnzpQxIOpt6/IKA9dNdtSWpuL+JJRYYEYl2FEW100MuDtG37D3eapoHV8n7rDloNFAq TRvDsGcI0uWTPukRPgUGZlRvQzft2RLO40zHObT9IerqTUppQ1A6xEvyBIy0nIGKd4gXGy t5HEAqLxe57Txj8AJQFFS4i7us8VF3RIPLbGaCKssq+X+gThBbGN4Sd0uxkLDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710357274; 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=5T/dGT/51uecTHq97Wlhgil9hHbzWZHzlHeqQaYLYpI=; b=u39LrGYKqb5NmAmYtgFI4HQre9rp7iWogOJpJyER6Vip4WKoyQMtxJkrLmYltJSLx4CFqC uRmzcPrcc83rRhW5DvoiGkAqyFg0H1mKuAKhLZZiEWxUVPow2/PumSDHBDvFFCNNH2/mRv IOBOR2981sFzbZd/p8f0wF3WjdOFa29bLrHOj4kH4J1kVBXxofMdXcIzkAFamUuCpsLa9J 8rxqOVhrNeYq+7emJlzC36H8IbP/DDm0NQneQD+Ak6mEMYKnSK1imb19kFdM/hUz2ZB+R6 seW/KldApkGvex+7/j0hgQFfCzGDqZfBPjDRXsmzCF0bGzGtPY5crCQ166Gn2w== 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 4Tw0Z16qkczvl7; Wed, 13 Mar 2024 19:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42DJEXhG069828; Wed, 13 Mar 2024 19:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42DJEXIE069825; Wed, 13 Mar 2024 19:14:33 GMT (envelope-from git) Date: Wed, 13 Mar 2024 19:14:33 GMT Message-Id: <202403131914.42DJEXIE069825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e4315bbc85b7 - main - tcp: move struct tcp_ifcap declaration under _KERNEL 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4315bbc85b7b0cf4c92d27b261f5ccf97bd1ed1 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e4315bbc85b7b0cf4c92d27b261f5ccf97bd1ed1 commit e4315bbc85b7b0cf4c92d27b261f5ccf97bd1ed1 Author: Gleb Smirnoff AuthorDate: 2024-03-13 19:14:18 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-13 19:14:18 +0000 tcp: move struct tcp_ifcap declaration under _KERNEL Reviewed by: rscheff, tuexen, kib Differential Revision: https://reviews.freebsd.org/D44340 --- sys/netinet/tcp_var.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index b2603f97e6f9..6f7f7115c2f4 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -895,17 +895,6 @@ struct hc_metrics_lite { /* must stay in sync with hc_metrics */ uint32_t rmx_recvpipe; /* inbound delay-bandwidth product */ }; -/* - * Used by tcp_maxmtu() to communicate interface specific features - * and limits at the time of connection setup. - */ -struct tcp_ifcap { - int ifcap; - u_int tsomax; - u_int tsomaxsegcount; - u_int tsomaxsegsize; -}; - #ifndef _NETINET_IN_PCB_H_ struct in_conninfo; #endif /* _NETINET_IN_PCB_H_ */ @@ -1438,8 +1427,19 @@ extern int32_t tcp_attack_on_turns_on_logging; extern uint32_t tcp_ack_war_time_window; extern uint32_t tcp_ack_war_cnt; +/* + * Used by tcp_maxmtu() to communicate interface specific features + * and limits at the time of connection setup. + */ +struct tcp_ifcap { + int ifcap; + u_int tsomax; + u_int tsomaxsegcount; + u_int tsomaxsegsize; +}; uint32_t tcp_maxmtu(struct in_conninfo *, struct tcp_ifcap *); uint32_t tcp_maxmtu6(struct in_conninfo *, struct tcp_ifcap *); + void tcp6_use_min_mtu(struct tcpcb *); u_int tcp_maxseg(const struct tcpcb *); u_int tcp_fixed_maxseg(const struct tcpcb *);