diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-01-12 02:47:08 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-01-12 02:47:08 +0000 |
| commit | 313603d4428293c98b8b3c8507cd482b109cc026 (patch) | |
| tree | 8746d1db53a827c92601b06cdb577096c9d8801d | |
| parent | 553ca1bf4e7c535615967c9b39fb0532c974b1f5 (diff) | |
Remove bpfdetach() call right in front of the if_detach() call since
bpfdetach() will be called in if_detach(). Diff by Gleydson Soares
| -rw-r--r-- | sys/net/if_pflog.c | 5 | ||||
| -rw-r--r-- | sys/net/if_pflow.c | 5 | ||||
| -rw-r--r-- | sys/net/if_pfsync.c | 5 |
3 files changed, 3 insertions, 12 deletions
diff --git a/sys/net/if_pflog.c b/sys/net/if_pflog.c index e8dd67979af..1b12cd2ea42 100644 --- a/sys/net/if_pflog.c +++ b/sys/net/if_pflog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflog.c,v 1.27 2007/12/20 02:53:02 brad Exp $ */ +/* $OpenBSD: if_pflog.c,v 1.28 2010/01/12 02:47:07 claudio Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -148,9 +148,6 @@ pflog_clone_destroy(struct ifnet *ifp) LIST_REMOVE(pflogif, sc_list); splx(s); -#if NBPFILTER > 0 - bpfdetach(ifp); -#endif if_detach(ifp); free(pflogif, M_DEVBUF); return (0); diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c index 606dd4079e3..dfb386f7c41 100644 --- a/sys/net/if_pflow.c +++ b/sys/net/if_pflow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflow.c,v 1.11 2009/06/17 06:35:30 gollo Exp $ */ +/* $OpenBSD: if_pflow.c,v 1.12 2010/01/12 02:47:07 claudio Exp $ */ /* * Copyright (c) 2008 Henning Brauer <henning@openbsd.org> @@ -156,9 +156,6 @@ pflow_clone_destroy(struct ifnet *ifp) s = splnet(); pflow_sendout(sc); -#if NBPFILTER > 0 - bpfdetach(ifp); -#endif if_detach(ifp); SLIST_REMOVE(&pflowif_list, sc, pflow_softc, sc_next); free(sc->sc_imo.imo_membership, M_IPMOPTS); diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 34374494af1..fd84d3a3ba3 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.137 2010/01/11 00:19:11 dlg Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.138 2010/01/12 02:47:07 claudio Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -335,9 +335,6 @@ pfsync_clone_destroy(struct ifnet *ifp) if (!pfsync_sync_ok) carp_group_demote_adj(&sc->sc_if, -1); #endif -#if NBPFILTER > 0 - bpfdetach(ifp); -#endif if_detach(ifp); pfsync_drop(sc); |