From owner-dev-commits-src-branches@freebsd.org Sun Jul 25 08:18:14 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 740316559D1; Sun, 25 Jul 2021 08:18:14 +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 4GXbXk1G11z3ljx; Sun, 25 Jul 2021 08:18:14 +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 06B48202D0; Sun, 25 Jul 2021 08:18:14 +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 16P8IDqq043773; Sun, 25 Jul 2021 08:18:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16P8IDdA043772; Sun, 25 Jul 2021 08:18:13 GMT (envelope-from git) Date: Sun, 25 Jul 2021 08:18:13 GMT Message-Id: <202107250818.16P8IDdA043772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: f188c39c41a9 - stable/12 - pf: add a comment to pf_kstate concerning compat with pf_state_cmp MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f188c39c41a9fe9d546cd1cef058078fb402b8c7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jul 2021 08:18:14 -0000 The branch stable/12 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f188c39c41a9fe9d546cd1cef058078fb402b8c7 commit f188c39c41a9fe9d546cd1cef058078fb402b8c7 Author: Mateusz Guzik AuthorDate: 2021-07-19 12:17:33 +0000 Commit: Mateusz Guzik CommitDate: 2021-07-25 07:06:32 +0000 pf: add a comment to pf_kstate concerning compat with pf_state_cmp Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit f9aa757d8d1e1bfc7951f462e92f00639256cad6) --- sys/net/pfvar.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index dc9647f86c0b..ba6645131ef9 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -578,10 +578,16 @@ _Static_assert(sizeof(struct pf_state_export) == 384, "size incorrect"); #ifdef _KERNEL struct pf_kstate { + /* + * Area shared with pf_state_cmp + */ u_int64_t id; u_int32_t creatorid; u_int8_t direction; u_int8_t pad[3]; + /* + * end of the area + */ u_int refs; TAILQ_ENTRY(pf_kstate) sync_list;