diff options
| author |   pascoe <pascoe@openbsd.org> | 2005-04-28 10:38:55 +0000 |
|---|---|---|
| committer | pascoe <pascoe@openbsd.org> | 2005-04-28 10:38:55 +0000 |
| commit | ce13b5a3b68dce485a91c5b7f43354eaacbdc1ae (patch) | |
| tree | b18466e371e9e44f8cdd98c6cb6c742c70d73794 | |
| parent | add snprintf checks. ok djm@ markus@ (diff) | |
| download | wireguard-openbsd-ce13b5a3b68dce485a91c5b7f43354eaacbdc1ae.tar.xz wireguard-openbsd-ce13b5a3b68dce485a91c5b7f43354eaacbdc1ae.zip | |
Don't detach interface from pf's perspective until after IPv6 is done with it.
ok dlg@ henning@
| -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 |