git: 586fae3cd286 - main - Revert "pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 30 Oct 2023 10:12:30 UTC
The branch main has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=586fae3cd28661cfb45bb12306c8e6d048bb9f2e
commit 586fae3cd28661cfb45bb12306c8e6d048bb9f2e
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2023-10-30 08:09:56 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-10-30 08:17:56 +0000
Revert "pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h"
This reverts commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4.
The libpfctl port has been fixed (to avoid using DIOCGETSTATESV2), so we
can now safely revert this.
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
sys/net/pfvar.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 6a5f8761755d..27992864c899 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1952,7 +1952,9 @@ 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)
@@ -2013,7 +2015,9 @@ 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)