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.

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 2202421086d2ed3c374124b963646bd124fe2bf9..73de877847e6724a2a18f608729f671491e4b92c 100644 (file)
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -42,6 +42,7 @@
 #include <sys/malloc.h>
 #include <sys/nv.h>
 #include <sys/refcount.h>
+#include <sys/sdt.h>
 #include <sys/sysctl.h>
 #include <sys/lock.h>
 #include <sys/rmlock.h>
@@ -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 2d379d66486e0fdeac7608f11f2b14b01fce36b8..42c22ef9b89406b623985182af69b0dae6d97cab 100644 (file)
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
 #include <net/altq/altq.h>
 #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 e53d19018ffec68aaa10ed8aac8c569dd6bd03b3..9e7bd7c3627eb7665d2c653f9e895fd877d7e11f 100644 (file)
--- a/sys/netpfil/pf/pf_nv.h
+++ b/sys/netpfil/pf/pf_nv.h
@@ -37,7 +37,6 @@
 #include <net/if_var.h>
 #include <net/pfvar.h>
 
-SDT_PROVIDER_DECLARE(pf);
 SDT_PROBE_DECLARE(pf, ioctl, function, error);
 SDT_PROBE_DECLARE(pf, ioctl, nvchk, error);