From 1ad78757045c6d2b934981a758118e91c30d3ccb Mon Sep 17 00:00:00 2001 From: mlaier Date: Mon, 21 Feb 2005 17:20:00 +0000 Subject: Fix a terrible braino in pfi_maybe_destroy() and unbreak "$pfctl -Fall" with renamed interfaces. PR: kern/77645 Reported by: Harald Schmalzbauer Reviewed by: yongari MFC after: 3 days --- sys/contrib/pf/net/pf_if.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sys') diff --git a/sys/contrib/pf/net/pf_if.c b/sys/contrib/pf/net/pf_if.c index 21d8c00..438e2ee 100644 --- a/sys/contrib/pf/net/pf_if.c +++ b/sys/contrib/pf/net/pf_if.c @@ -849,10 +849,13 @@ pfi_maybe_destroy(struct pfi_kif *p) int i, j, k, s; struct pfi_kif *q = p->pfik_parent; +#ifdef __FreeBSD__ + if ((p->pfik_flags & (PFI_IFLAG_ATTACHED | PFI_IFLAG_GROUP)) || + ((p->pfik_rules > 0 || p->pfik_states > 0) && + (p->pfik_flags & PFI_IFLAG_PLACEHOLDER) == 0)) +#else if ((p->pfik_flags & (PFI_IFLAG_ATTACHED | PFI_IFLAG_GROUP)) || p->pfik_rules > 0 || p->pfik_states > 0) -#ifdef __FreeBSD__ - if (!(p->pfik_flags & PFI_IFLAG_PLACEHOLDER)) #endif return (0); -- cgit v1.1