Remove redundant calls to bpfdetach.

ok brad@

20 files changed, 20 insertions, 80 deletions

diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 6c29d3729ff..6e45823b46c 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.44 2005/12/10 15:43:11 krw Exp $  */
+/*      $OpenBSD: ath.c,v 1.45 2006/01/04 06:04:41 canacar Exp $  */
 /*	$NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $	*/
 
 /*-
@@ -451,9 +451,6 @@ ath_detach(struct ath_softc *sc, int flags)
 
 	s = splnet();
 	ath_stop(ifp);
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	ath_desc_free(sc);
 	ath_hal_detach(sc->sc_ah);
 
diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c
index 685b2dd2a36..4d14123f95d 100644
--- a/sys/dev/ic/awi.c
+++ b/sys/dev/ic/awi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: awi.c,v 1.19 2005/05/23 23:26:55 tedu Exp $	*/
+/*	$OpenBSD: awi.c,v 1.20 2006/01/04 06:04:41 canacar Exp $	*/
 /*	$NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $	*/
 
 /*-
@@ -389,9 +389,6 @@ awi_detach(sc)
 	}
 	if (sc->sc_wep_ctx != NULL)
 		free(sc->sc_wep_ctx, M_DEVBUF);
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 #ifdef IFM_IEEE80211
 	ifmedia_delete_instance(&sc->sc_media, IFM_INST_ANY);
 #endif
diff --git a/sys/dev/ic/ral.c b/sys/dev/ic/ral.c
index 8f14d79214a..4f23e6274d3 100644
--- a/sys/dev/ic/ral.c
+++ b/sys/dev/ic/ral.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ral.c,v 1.65 2005/11/23 21:29:01 damien Exp $  */
+/*	$OpenBSD: ral.c,v 1.66 2006/01/04 06:04:41 canacar Exp $  */
 
 /*-
  * Copyright (c) 2005
@@ -473,9 +473,6 @@ ral_detach(struct ral_softc *sc)
 	timeout_del(&sc->scan_ch);
 	timeout_del(&sc->rssadapt_ch);
 
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	ieee80211_ifdetach(ifp);
 	if_detach(ifp);
 
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 4e4d1399e44..d0c9d4091d0 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ipw.c,v 1.52 2005/11/23 21:29:05 damien Exp $	*/
+/*	$OpenBSD: if_ipw.c,v 1.53 2006/01/04 06:04:41 canacar Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
@@ -301,9 +301,6 @@ ipw_detach(struct device* self, int flags)
 
 	ipw_stop(ifp, 1);
 
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	ieee80211_ifdetach(ifp);
 	if_detach(ifp);
 
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 57e00f93e00..66370b0cdad 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwi.c,v 1.55 2005/11/23 21:29:05 damien Exp $	*/
+/*	$OpenBSD: if_iwi.c,v 1.56 2006/01/04 06:04:41 canacar Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
@@ -328,9 +328,6 @@ iwi_detach(struct device* self, int flags)
 
 	iwi_stop(ifp, 1);
 
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	ieee80211_ifdetach(ifp);
 	if_detach(ifp);
 
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index b58b77115f7..275e28c1dc2 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atu.c,v 1.64 2005/08/01 05:36:47 brad Exp $ */
+/*	$OpenBSD: if_atu.c,v 1.65 2006/01/04 06:04:41 canacar Exp $ */
 /*
  * Copyright (c) 2003, 2004
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  All rights reserved.
@@ -1494,9 +1494,6 @@ USB_DETACH(atu)
 
 	if (sc->sc_state != ATU_S_UNCONFIG) {
 		atu_stop(ifp, 1);
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 		ieee80211_ifdetach(ifp);
 		if_detach(ifp);
 
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index 58da1ae55ba..425a5a950a3 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral.c,v 1.53 2005/12/23 08:10:12 jsg Exp $  */
+/*	$OpenBSD: if_ral.c,v 1.54 2006/01/04 06:04:41 canacar Exp $  */
 
 /*-
  * Copyright (c) 2005
@@ -540,9 +540,6 @@ USB_DETACH(ural)
 	ural_free_rx_list(sc);
 	ural_free_tx_list(sc);
 
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	ieee80211_ifdetach(ifp);
 	if_detach(ifp);
 
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index eb46d766b1e..57370973563 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upl.c,v 1.20 2005/08/01 05:36:48 brad Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.21 2006/01/04 06:04:41 canacar Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -371,9 +371,6 @@ USB_DETACH(upl)
 #if NRND > 0
 	rnd_detach_source(&sc->sc_rnd_source);
 #endif
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 
 	if_detach(ifp);
 
diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c
index 5bb586e1135..b136811c761 100644
--- a/sys/dev/usb/ueagle.c
+++ b/sys/dev/usb/ueagle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ueagle.c,v 1.7 2005/08/04 06:59:36 canacar Exp $	*/
+/*	$OpenBSD: ueagle.c,v 1.8 2006/01/04 06:04:41 canacar Exp $	*/
 
 /*-
  * Copyright (c) 2003-2005
@@ -248,9 +248,6 @@ USB_DETACH(ueagle)
 		    USBDEVNAME(sc->sc_dev)));
 	}
 
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	if_detach(ifp);
 
 	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index ef434bc4e05..c86338ee816 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.c,v 1.146 2005/10/09 19:44:22 reyk Exp $	*/
+/*	$OpenBSD: if_bridge.c,v 1.147 2006/01/04 06:04:41 canacar Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -260,9 +260,6 @@ bridge_clone_destroy(struct ifnet *ifp)
 	LIST_REMOVE(sc, sc_list);
 	splx(s);
 
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif  
 	if_detach(ifp);
 
 	free(sc, M_DEVBUF);
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index d4f0587efc1..2e66d742581 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_faith.c,v 1.19 2005/07/31 03:53:38 pascoe Exp $	*/
+/*	$OpenBSD: if_faith.c,v 1.20 2006/01/04 06:04:42 canacar Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -121,9 +121,6 @@ int
 faith_clone_destroy(ifp)
 	struct ifnet *ifp;
 {
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif  
 	if_detach(ifp);
 
 	free(ifp, M_DEVBUF);
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 931791e25a5..7e67b83e1b0 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gif.c,v 1.32 2005/07/31 03:52:18 pascoe Exp $	*/
+/*	$OpenBSD: if_gif.c,v 1.33 2006/01/04 06:04:42 canacar Exp $	*/
 /*	$KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $	*/
 
 /*
@@ -131,9 +131,6 @@ gif_clone_destroy(ifp)
 	LIST_REMOVE(sc, gif_list);
 	splx(s);
 
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	if_detach(ifp);
 
 	if (sc->gif_psrc)
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 6b71b794734..7a94b29c29e 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_gre.c,v 1.37 2005/12/10 18:40:29 krw Exp $ */
+/*      $OpenBSD: if_gre.c,v 1.38 2006/01/04 06:04:42 canacar Exp $ */
 /*	$NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
@@ -179,9 +179,6 @@ gre_clone_destroy(struct ifnet *ifp)
 	LIST_REMOVE(sc, sc_list);
 	splx(s);
 
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif  
 	if_detach(ifp);
 
 	free(sc, M_DEVBUF);
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 2bd8096208b..d3556ef14e8 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_loop.c,v 1.37 2005/08/02 13:42:05 markus Exp $	*/
+/*	$OpenBSD: if_loop.c,v 1.38 2006/01/04 06:04:42 canacar Exp $	*/
 /*	$NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $	*/
 
 /*
@@ -223,9 +223,6 @@ loop_clone_destroy(ifp)
 	if (ifp == lo0ifp)
 		return (EPERM);
 
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	if_detach(ifp);
 
 	free(ifp, M_DEVBUF);
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 0f34d6c153f..04b996a7918 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.42 2004/06/21 23:50:36 tholo Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.43 2006/01/04 06:04:42 canacar Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -283,9 +283,6 @@ ppp_clone_destroy(ifp)
     LIST_REMOVE(sc, sc_list);
     splx(s);
 
-#if NBPFILTER > 0
-    bpfdetach(ifp);
-#endif
     if_detach(ifp);
 
     free(sc, M_DEVBUF);
diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c
index 41718edfe69..f93a590f574 100644
--- a/sys/net/if_pppoe.c
+++ b/sys/net/if_pppoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pppoe.c,v 1.5 2005/10/08 20:31:25 canacar Exp $ */
+/* $OpenBSD: if_pppoe.c,v 1.6 2006/01/04 06:04:42 canacar Exp $ */
 /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */
 
 /*
@@ -278,9 +278,6 @@ pppoe_clone_destroy(struct ifnet *ifp)
 	timeout_del(&sc->sc_timeout);
 	splx(s);
 	
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	sppp_detach(&sc->sc_sppp.pp_if);
 	if_detach(ifp);
 
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 81684b7eab7..6d768ec69bb 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sl.c,v 1.29 2004/06/24 19:35:25 tholo Exp $	*/
+/*	$OpenBSD: if_sl.c,v 1.30 2006/01/04 06:04:42 canacar Exp $	*/
 /*	$NetBSD: if_sl.c,v 1.39.4.1 1996/06/02 16:26:31 thorpej Exp $	*/
 
 /*
@@ -253,9 +253,6 @@ sl_clone_destroy(ifp)
 	LIST_REMOVE(sc, sc_list);
 	splx(s);
 
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	if_detach(ifp);
 
 	free(sc, M_DEVBUF);
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c
index 513399bcfcd..08da7ec40cd 100644
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_trunk.c,v 1.18 2005/12/21 18:44:21 reyk Exp $	*/
+/*	$OpenBSD: if_trunk.c,v 1.19 2006/01/04 06:04:42 canacar Exp $	*/
 
 /*
  * Copyright (c) 2005 Reyk Floeter <reyk@openbsd.org>
@@ -198,9 +198,6 @@ trunk_clone_destroy(struct ifnet *ifp)
 	}
 
 	ifmedia_delete_instance(&tr->tr_media, IFM_INST_ANY);
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	ether_ifdetach(ifp);
 	if_detach(ifp);
 
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index e164aee9599..6d5c39b3e70 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vlan.c,v 1.60 2005/10/23 14:07:11 mpf Exp $	*/
+/*	$OpenBSD: if_vlan.c,v 1.61 2006/01/04 06:04:42 canacar Exp $	*/
 
 /*
  * Copyright 1998 Massachusetts Institute of Technology
@@ -151,9 +151,6 @@ vlan_clone_destroy(struct ifnet *ifp)
 	struct ifvlan *ifv = ifp->if_softc;
 
 	vlan_unconfig(ifp);
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif  
 	ether_ifdetach(ifp);
 	if_detach(ifp);
 
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index 38c0ac3133f..677bac6f42e 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211.c,v 1.15 2005/12/09 03:48:11 jsg Exp $	*/
+/*	$OpenBSD: ieee80211.c,v 1.16 2006/01/04 06:04:42 canacar Exp $	*/
 /*	$NetBSD: ieee80211.c,v 1.19 2004/06/06 05:45:29 dyoung Exp $	*/
 
 /*-
@@ -180,9 +180,6 @@ ieee80211_ifdetach(struct ifnet *ifp)
 	ieee80211_node_detach(ifp);
 	LIST_REMOVE(ic, ic_list);
 	ifmedia_delete_instance(&ic->ic_media, IFM_INST_ANY);
-#if NBPFILTER > 0
-	bpfdetach(ifp);
-#endif
 	ether_ifdetach(ifp);
 }