diff --git a/sys/conf/options b/sys/conf/options index bd873490bd1..63b6b8d44ec 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -989,9 +989,6 @@ PAX_ASLR_COMPAT_DELTA_STACK_DEF_LEN opt_pax.h PAX_ASLR_COMPAT_DELTA_VDSO_DEF_LEN opt_pax.h PAX_ASLR_COMPAT_DELTA_EXEC_DEF_LEN opt_pax.h -# OPNsense additions -PF_SHARE_FORWARD opt_pf.h - # Random number generator(s) # Which CSPRNG hash we get. # If Yarrow is not chosen, Fortuna is selected. diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index bb40d352694..983108e8fca 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -374,13 +374,8 @@ SYSCTL_ULONG(_net_pf, OID_AUTO, states_hashsize, CTLFLAG_RDTUN, SYSCTL_ULONG(_net_pf, OID_AUTO, source_nodes_hashsize, CTLFLAG_RDTUN, &pf_srchashsize, 0, "Size of pf(4) source nodes hashtable"); -#ifdef PF_SHARE_FORWARD -static VNET_DEFINE(int, pf_share_forward) = 1; -static VNET_DEFINE(int, pf_share_forward6) = 1; -#else static VNET_DEFINE(int, pf_share_forward) = 0; static VNET_DEFINE(int, pf_share_forward6) = 0; -#endif #define V_pf_share_forward VNET(pf_share_forward) #define V_pf_share_forward6 VNET(pf_share_forward6)