diff options
| author | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2005-04-28 10:38:56 +0000 |
|---|---|---|
| committer | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2005-04-28 10:38:56 +0000 |
| commit | cf257559ce8ca0954fc93fadd0b3d498c5130375 (patch) | |
| tree | 5c8df600e2c7a8e9fc3113a42f71c627986c5dd2 /sys/net | |
| parent | d4d4b1387981f640d52bb7584d0bc5096cd091bb (diff) | |
Don't detach interface from pf's perspective until after IPv6 is done with it.
ok dlg@ henning@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index ffaed85044a..5689a359ef4 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.107 2005/04/20 23:00:41 mpf Exp $ */ +/* $OpenBSD: if.c,v 1.108 2005/04/28 10:38:55 pascoe Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -504,10 +504,6 @@ if_detach(ifp) ifp->if_init = if_detached_init; ifp->if_watchdog = if_detached_watchdog; -#if NPF > 0 - pfi_detach_ifnet(ifp); -#endif - #if NBRIDGE > 0 /* Remove the interface from any bridge it is part of. */ if (ifp->if_bridge) @@ -557,6 +553,10 @@ if_detach(ifp) in6_ifdetach(ifp); #endif +#if NPF > 0 + pfi_detach_ifnet(ifp); +#endif + /* * remove packets came from ifp, from software interrupt queues. * net/netisr_dispatch.h is not usable, as some of them use |