From owner-dev-commits-src-all@freebsd.org Tue Jun 1 07:02:18 2021 Return-Path: Delivered-To: dev-commits-src-all@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 EB3D864D126; Tue, 1 Jun 2021 07:02:18 +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 4FvNQ26LGCz3kBy; Tue, 1 Jun 2021 07:02:18 +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 C0DE51F512; Tue, 1 Jun 2021 07:02: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 15172IWM077416; Tue, 1 Jun 2021 07:02:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15172IE1077415; Tue, 1 Jun 2021 07:02:18 GMT (envelope-from git) Date: Tue, 1 Jun 2021 07:02:18 GMT Message-Id: <202106010702.15172IE1077415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ec7b47fc81b2 - main - pf: Move provider declaration to pf.h 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/main X-Git-Reftype: branch X-Git-Commit: ec7b47fc81b22470fb177d9e03b5a76818eee65f Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2021 07:02:19 -0000 The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ec7b47fc81b22470fb177d9e03b5a76818eee65f commit ec7b47fc81b22470fb177d9e03b5a76818eee65f Author: Kristof Provost AuthorDate: 2021-05-31 16:34:37 +0000 Commit: Kristof Provost CommitDate: 2021-06-01 07:02:05 +0000 pf: Move provider declaration to pf.h This simplifies life a bit, by not requiring us to repease the declaration for every file where we want static probe points. It also makes the gcc6 build happy. --- sys/net/pfvar.h | 3 +++ sys/netpfil/pf/pf_ioctl.c | 1 - sys/netpfil/pf/pf_nv.h | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 2202421086d2..73de877847e6 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -60,6 +61,8 @@ SYSCTL_DECL(_net_pf); MALLOC_DECLARE(M_PFHASH); +SDT_PROVIDER_DECLARE(pf); + struct pfi_dynaddr { TAILQ_ENTRY(pfi_dynaddr) entry; struct pf_addr pfid_addr4; diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 2d379d66486e..42c22ef9b894 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$"); #include #endif -SDT_PROVIDER_DECLARE(pf); SDT_PROBE_DEFINE3(pf, ioctl, ioctl, error, "int", "int", "int"); SDT_PROBE_DEFINE3(pf, ioctl, function, error, "char *", "int", "int"); SDT_PROBE_DEFINE2(pf, ioctl, addrule, error, "int", "int"); diff --git a/sys/netpfil/pf/pf_nv.h b/sys/netpfil/pf/pf_nv.h index e53d19018ffe..9e7bd7c3627e 100644 --- a/sys/netpfil/pf/pf_nv.h +++ b/sys/netpfil/pf/pf_nv.h @@ -37,7 +37,6 @@ #include #include -SDT_PROVIDER_DECLARE(pf); SDT_PROBE_DECLARE(pf, ioctl, function, error); SDT_PROBE_DECLARE(pf, ioctl, nvchk, error);