Remove redundant calls to bpfdetach.

ok brad@

9 files changed, 9 insertions, 36 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,