From nobody Tue Feb 15 08:48:18 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 184B719C31AB; Tue, 15 Feb 2022 08:48:19 +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 4JyZVq09jGz3pQY; Tue, 15 Feb 2022 08:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644914899; 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=qCsK1yZJSXIcK0f98pZm1N6nZJvAnJ/jXmLgRn4LlsE=; b=voegH2IteNswUXdEG4i9ID18wSAd1k1Os6BCbQY0SE9GB2BUBnirtKBbRoKq4Cn42OU5Ny aamgSIulrnDIwaPMgrm4IVuwFx6TRt4E9ulOWOUL2Abf04q0eq7fpUG+u7UThHzK1pXCNQ z0To18+uKz4XOorZ7gCb4gaaL70K2l8KHRSd/Uda9rZlThJnMqHQglWY2/rIV8kJ27pgoW 6B8K77qqYVKr2N0MIFfqFqOo9YlvrNAAYcfHeWUkpjf4wiv3l+YGi9M3lld22pmf04WOi9 xaq/wubaOHUTx0qDdB0Mv7hz6lx0LZxm86gK0/ocyYNm88g91EZlG+eJ2YTfvg== 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 D6E1D1F3ED; Tue, 15 Feb 2022 08:48:18 +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 21F8mIec082442; Tue, 15 Feb 2022 08:48:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21F8mIGL082441; Tue, 15 Feb 2022 08:48:18 GMT (envelope-from git) Date: Tue, 15 Feb 2022 08:48:18 GMT Message-Id: <202202150848.21F8mIGL082441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 0c2832ee4f2d - main - tcp: Restore 6 tcps padding entries in HEAD 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c2832ee4f2d2dab4cf2260e8afd5b2f81f6f2b9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644914899; 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=qCsK1yZJSXIcK0f98pZm1N6nZJvAnJ/jXmLgRn4LlsE=; b=ouvMfIod+54tB2vg07Rfq1sK3OUQ+PKn7KEFr7Ol6rYFbCSV5fz2emjK5q4Yr9wEmUjOnX utZyNgy3sqWG/tqhx53JNMTJIFDH7yTT8i8XRkd1N7jhHb9BXVinySEgHK/djXlnTIRImt wopKVaUvDt5AU/rc3G8m1LKJxokqAM1qHnaAfYndwYjlCbSFroy8HYjXN8owGQvYX4kFGc hzUMVWYh1ekmG69Ft7DLfur16U6+2QBgIKc3K1mETOXRdgl5e860OjuPzn0rTZ3Q5YbPhe Z6WGQrun2iI8Ui2KDiQ9+EHR9UH8Wvamd9AraoEzIbKpSBRqxa9k1mibMZovOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644914899; a=rsa-sha256; cv=none; b=DsKQjQzBRr+A+yyhLWq32MCoeowqD1/S+j9A0t21eKwTmyYIfPkLhd1bYv+TShuYvFxV9R ItVQ8RWINBz+HQbg7b5KlsFLmVFWhivcseEt6O78wZO84/ljKElJ8c0wTCm6Jh9WdJeot3 acaAGYlJGhlfzmTOsMlkrB1oLETLz0ULCZCI0nQYGMAfMA5q3pgSzCDllqIRqPJubATXyY j7B+0d4aXzOYCTweKS0obL7i6bPjNND/q4uJRsvhUSvvq+VtrunnJUdl9ZR3RGE5CZFlNn 88nyftMSVAZ6sQ3vJj8MXTtVzyaZzG48V7jJCo2wf3RsXFjPn0FKjByOme7rFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=0c2832ee4f2d2dab4cf2260e8afd5b2f81f6f2b9 commit 0c2832ee4f2d2dab4cf2260e8afd5b2f81f6f2b9 Author: Richard Scheffenegger AuthorDate: 2022-02-15 07:56:49 +0000 Commit: Richard Scheffenegger CommitDate: 2022-02-15 08:24:07 +0000 tcp: Restore 6 tcps padding entries in HEAD The padding in CURRENT shall not shrink. It is designed that in CURRENT at always stays the same, and then when a new stable is branched, it inherits 6 pointer placeholders that can be used withing this stable/X lifetime to extend the structure. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D34269 --- sys/netinet/tcp_var.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 68e78ee8892d..6b1f79a0b9ed 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -826,7 +826,7 @@ struct tcpstat { uint64_t tcps_ace_ect0; /* ACE SYN packet with ECT0 */ uint64_t tcps_ace_ce; /* ACE SYN packet with CE */ - uint64_t _pad[2]; /* 2 TBD */ + uint64_t _pad[6]; /* 6 TBD placeholder for STABLE */ }; #define tcps_rcvmemdrop tcps_rcvreassfull /* compat */