Date: Thu, 19 Oct 2023 14:20:44 GMT From: Kristof Provost <kp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 9eff6390718d - main - pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h Message-ID: <202310191420.39JEKitw071108@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 Author: Kristof Provost <kp@FreeBSD.org> AuthorDate: 2023-10-19 10:06:29 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2023-10-19 14:19:39 +0000 pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h When userspace includes pfvar.h it doesn't get the kernel's COMPAT_* defines, so we end up not having required symbols in userspace. This caused the libpfctl port to fail to build. libpfctl will be updated to use the new netlink-based state export code soon, which will also fix thix build issue. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 59579a0849d9..ec8f8293945b 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1951,9 +1951,7 @@ struct pfioc_iface { #define DIOCCLRSTATUS _IO ('D', 22) #define DIOCNATLOOK _IOWR('D', 23, struct pfioc_natlook) #define DIOCSETDEBUG _IOWR('D', 24, u_int32_t) -#ifdef COMPAT_FREEBSD14 #define DIOCGETSTATES _IOWR('D', 25, struct pfioc_states) -#endif #define DIOCCHANGERULE _IOWR('D', 26, struct pfioc_rule) /* XXX cut 26 - 28 */ #define DIOCSETTIMEOUT _IOWR('D', 29, struct pfioc_tm) @@ -2014,9 +2012,7 @@ struct pfioc_iface { #define DIOCKILLSRCNODES _IOWR('D', 91, struct pfioc_src_node_kill) #define DIOCGIFSPEEDV0 _IOWR('D', 92, struct pf_ifspeed_v0) #define DIOCGIFSPEEDV1 _IOWR('D', 92, struct pf_ifspeed_v1) -#ifdef COMPAT_FREEBSD14 #define DIOCGETSTATESV2 _IOWR('D', 93, struct pfioc_states_v2) -#endif #define DIOCGETSYNCOOKIES _IOWR('D', 94, struct pfioc_nv) #define DIOCSETSYNCOOKIES _IOWR('D', 95, struct pfioc_nv) #define DIOCKEEPCOUNTERS _IOWR('D', 96, struct pfioc_nv)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310191420.39JEKitw071108>