From owner-dev-commits-src-branches@freebsd.org Wed Jan 20 14:45:00 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 762F94F899F; Wed, 20 Jan 2021 14:45:00 +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 4DLSwq3BTcz4qtC; Wed, 20 Jan 2021 14:44:59 +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 8AD221AE56; Wed, 20 Jan 2021 14:44:58 +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 10KEiwWj019408; Wed, 20 Jan 2021 14:44:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10KEiwxJ019407; Wed, 20 Jan 2021 14:44:58 GMT (envelope-from git) Date: Wed, 20 Jan 2021 14:44:58 GMT Message-Id: <202101201444.10KEiwxJ019407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 7ee74e43abb7 - stable/12 - pf: Remove unused fields from pf_krule MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7ee74e43abb78af75cc381bafbc30c9d5340b09d 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: Wed, 20 Jan 2021 14:45:01 -0000 The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7ee74e43abb78af75cc381bafbc30c9d5340b09d commit 7ee74e43abb78af75cc381bafbc30c9d5340b09d Author: Kristof Provost AuthorDate: 2020-12-05 13:38:12 +0000 Commit: Kristof Provost CommitDate: 2021-01-20 14:16:04 +0000 pf: Remove unused fields from pf_krule The u_* counters are used only to communicate with userspace, as userspace cannot use counter_u64. As pf_krule is not passed to userspace these fields are now obsolete. MFC after: 2 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D27759 (cherry picked from commit c7bdafe2f1b703fdf72489019edc3d6b9e5483da) --- sys/net/pfvar.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 4dd2db1a34b9..5b77b0a6c4e2 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -391,10 +391,6 @@ struct pf_krule { struct pf_addr addr; u_int16_t port; } divert; - - uint64_t u_states_cur; - uint64_t u_states_tot; - uint64_t u_src_nodes; }; struct pf_ksrc_node {