From nobody Sun Dec 19 16:23:06 2021 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 2B83B1908D15; Sun, 19 Dec 2021 16:23:07 +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 4JH7LL664Lz3PX3; Sun, 19 Dec 2021 16:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B172E25D97; Sun, 19 Dec 2021 16:23:06 +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 1BJGN6nb006763; Sun, 19 Dec 2021 16:23:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BJGN64N006762; Sun, 19 Dec 2021 16:23:06 GMT (envelope-from git) Date: Sun, 19 Dec 2021 16:23:06 GMT Message-Id: <202112191623.1BJGN64N006762@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: cb3772639fd0 - main - tcptw: remove unused fields 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: cb3772639fd0eb74961ff94248d448f5c7f035a9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639930986; 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=OCuz7/mJypmLkqEXASZrYgSYfm2+TnqbI0Bf7dQ+Svw=; b=gR7xOgg3oMquRWn2vS783xzpN62eKo29I/t1jjfge6B8sjZXd52TePKzflqRXTIgJE4VAP 9hCMKUUbn9PimC54KEJhz4jR6T9w1uz/d/OHv8h6oRC+/xzqnIXAwi3KwwB5SRrMdF+ANT b/mY0YobiEGjcBrBXOXqyqu7Nt4VR+gZ09PzNWbk0ROhxCyeVlh7BZgmHvltFCtJ9v3CaT 9CWXti4o0kJYzll3T7G+wiatEhFDIJEvfN5+0lv1tX/+bhF2nSvqfGR7/LTgCs2E5xHtee M4OVAF6fQ8yVEstcz+x/BpIYBldeB7UVW2jdAQNOJ3VEtxS1StYzryYsrXmstA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639930986; a=rsa-sha256; cv=none; b=cZfcwl0jjmFvG4lwEDM/qv7rsjLUF4dddGBwCxYStQ6pDf8Z3FxkKIsBh/nVuTxYpD63Gd ZImDecg3EcP6Xxay4G49jl+a/Cn/0lr/uyICiKH/08xNdXzkBtQi/AiZmD0Tzu8ighDz/H uxDGReyUu1ePaTvk+IL1GacQPapHESqp3uvfN8YfeT8pK8tEEzfUXiVo1HPiS9iyxzIOOI cMZXbbOO/WrOF1nEel+hZwkGHwAxFOFeaQFg6dnPCacPBbV5OHw6Qw7P+gXS2Xav0NOl27 7tPvaO4N6AOJYSPJkPwvGQsuiwYmlhdsw8TstF7WSQs8UDTIJiLpNyazuH8noA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=cb3772639fd0eb74961ff94248d448f5c7f035a9 commit cb3772639fd0eb74961ff94248d448f5c7f035a9 Author: Gleb Smirnoff AuthorDate: 2021-12-19 16:22:12 +0000 Commit: Gleb Smirnoff CommitDate: 2021-12-19 16:22:12 +0000 tcptw: remove unused fields The structure goes away anyway, but it would be interesting to know how much memory we used to save with it. So for the record, structure size with this revision is 64 bytes. --- sys/netinet/tcp_timewait.c | 3 --- sys/netinet/tcp_var.h | 5 ----- 2 files changed, 8 deletions(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index b0ab3e02c61f..f0ab77100336 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -324,9 +324,6 @@ tcp_twstart(struct tcpcb *tp) tw->snd_nxt = tp->snd_nxt; tw->t_port = tp->t_port; tw->rcv_nxt = tp->rcv_nxt; - tw->iss = tp->iss; - tw->irs = tp->irs; - tw->t_starttime = tp->t_starttime; tw->tw_time = 0; /* XXX diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 57d7352b8f11..6b121a7fd311 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -528,18 +528,13 @@ struct tcptw { t_unused:16; tcp_seq snd_nxt; tcp_seq rcv_nxt; - tcp_seq iss; - tcp_seq irs; u_short last_win; /* cached window value */ short tw_so_options; /* copy of so_options */ struct ucred *tw_cred; /* user credentials */ u_int32_t t_recent; u_int32_t ts_offset; /* our timestamp offset */ - u_int t_starttime; int tw_time; TAILQ_ENTRY(tcptw) tw_2msl; - void *tw_pspare; /* TCP_SIGNATURE */ - u_int *tw_spare; /* TCP_SIGNATURE */ }; #define intotcpcb(ip) ((struct tcpcb *)(ip)->inp_ppcb)