[src/trunk]: src/sys/dev/cardbus Remove conditional inclusion of unused bpf.h

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/292d90d96cfc
branches:  trunk
changeset: 750913:292d90d96cfc
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Jan 18 18:52:35 2010 +0000

description:
Remove conditional inclusion of unused bpf.h

diffstat:

 sys/dev/cardbus/if_ath_cardbus.c |  9 ++-------
 sys/dev/cardbus/if_atw_cardbus.c |  9 ++-------
 sys/dev/cardbus/if_fxp_cardbus.c |  9 ++-------
 sys/dev/cardbus/if_ral_cardbus.c |  5 ++---
 sys/dev/cardbus/if_rtk_cardbus.c |  8 ++------
 sys/dev/cardbus/if_rtw_cardbus.c |  9 ++-------
 sys/dev/cardbus/if_tlp_cardbus.c |  9 ++-------
 7 files changed, 14 insertions(+), 44 deletions(-)

diffs (211 lines):

diff -r a17883466135 -r 292d90d96cfc sys/dev/cardbus/if_ath_cardbus.c
--- a/sys/dev/cardbus/if_ath_cardbus.c  Mon Jan 18 18:49:27 2010 +0000
+++ b/sys/dev/cardbus/if_ath_cardbus.c  Mon Jan 18 18:52:35 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ath_cardbus.c,v 1.37 2010/01/08 19:47:42 dyoung Exp $ */
+/*     $NetBSD: if_ath_cardbus.c,v 1.38 2010/01/18 18:52:35 pooka Exp $ */
 /*
  * Copyright (c) 2003
  *     Ichiro FUKUHARA <ichiro%ichiro.org@localhost>.
@@ -30,10 +30,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.37 2010/01/08 19:47:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.38 2010/01/18 18:52:35 pooka Exp $");
 
 #include "opt_inet.h"
-#include "bpfilter.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,10 +54,6 @@
 #include <net80211/ieee80211_netbsd.h>
 #include <net80211/ieee80211_var.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
diff -r a17883466135 -r 292d90d96cfc sys/dev/cardbus/if_atw_cardbus.c
--- a/sys/dev/cardbus/if_atw_cardbus.c  Mon Jan 18 18:49:27 2010 +0000
+++ b/sys/dev/cardbus/if_atw_cardbus.c  Mon Jan 18 18:52:35 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_cardbus.c,v 1.28 2010/01/08 19:47:42 dyoung Exp $ */
+/* $NetBSD: if_atw_cardbus.c,v 1.29 2010/01/18 18:52:35 pooka Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc.
@@ -36,10 +36,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.28 2010/01/08 19:47:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.29 2010/01/18 18:52:35 pooka Exp $");
 
 #include "opt_inet.h"
-#include "bpfilter.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,10 +61,6 @@
 #include <net80211/ieee80211_radiotap.h>
 #include <net80211/ieee80211_var.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
diff -r a17883466135 -r 292d90d96cfc sys/dev/cardbus/if_fxp_cardbus.c
--- a/sys/dev/cardbus/if_fxp_cardbus.c  Mon Jan 18 18:49:27 2010 +0000
+++ b/sys/dev/cardbus/if_fxp_cardbus.c  Mon Jan 18 18:52:35 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fxp_cardbus.c,v 1.40 2009/09/05 14:50:10 tsutsui Exp $      */
+/*     $NetBSD: if_fxp_cardbus.c,v 1.41 2010/01/18 18:52:35 pooka Exp $        */
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,10 +34,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.40 2009/09/05 14:50:10 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.41 2010/01/18 18:52:35 pooka Exp $");
 
 #include "opt_inet.h"
-#include "bpfilter.h"
 #include "rnd.h"
 
 #include <sys/param.h>
@@ -61,10 +60,6 @@
 
 #include <machine/endian.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
diff -r a17883466135 -r 292d90d96cfc sys/dev/cardbus/if_ral_cardbus.c
--- a/sys/dev/cardbus/if_ral_cardbus.c  Mon Jan 18 18:49:27 2010 +0000
+++ b/sys/dev/cardbus/if_ral_cardbus.c  Mon Jan 18 18:52:35 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ral_cardbus.c,v 1.16 2009/05/12 14:17:31 cegger Exp $       */
+/*     $NetBSD: if_ral_cardbus.c,v 1.17 2010/01/18 18:52:35 pooka Exp $        */
 /*     $OpenBSD: if_ral_cardbus.c,v 1.6 2006/01/09 20:03:31 damien Exp $  */
 
 /*-
@@ -22,9 +22,8 @@
  * CardBus front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.16 2009/05/12 14:17:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.17 2010/01/18 18:52:35 pooka Exp $");
 
-#include "bpfilter.h"
 
 #include <sys/param.h>
 #include <sys/sockio.h>
diff -r a17883466135 -r 292d90d96cfc sys/dev/cardbus/if_rtk_cardbus.c
--- a/sys/dev/cardbus/if_rtk_cardbus.c  Mon Jan 18 18:49:27 2010 +0000
+++ b/sys/dev/cardbus/if_rtk_cardbus.c  Mon Jan 18 18:52:35 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_rtk_cardbus.c,v 1.38 2009/09/05 14:50:10 tsutsui Exp $      */
+/*     $NetBSD: if_rtk_cardbus.c,v 1.39 2010/01/18 18:52:35 pooka Exp $        */
 
 /*
  * Copyright (c) 2000 Masanori Kanaoka
@@ -36,10 +36,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.38 2009/09/05 14:50:10 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.39 2010/01/18 18:52:35 pooka Exp $");
 
 #include "opt_inet.h"
-#include "bpfilter.h"
 #include "rnd.h"
 
 #include <sys/param.h>
@@ -62,9 +61,6 @@
 #include <netinet/if_inarp.h>
 #endif
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
 #if NRND > 0
 #include <sys/rnd.h>
 #endif
diff -r a17883466135 -r 292d90d96cfc sys/dev/cardbus/if_rtw_cardbus.c
--- a/sys/dev/cardbus/if_rtw_cardbus.c  Mon Jan 18 18:49:27 2010 +0000
+++ b/sys/dev/cardbus/if_rtw_cardbus.c  Mon Jan 18 18:52:35 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.33 2010/01/08 19:47:42 dyoung Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.34 2010/01/18 18:52:35 pooka Exp $ */
 
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
@@ -64,10 +64,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.33 2010/01/08 19:47:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.34 2010/01/18 18:52:35 pooka Exp $");
 
 #include "opt_inet.h"
-#include "bpfilter.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,10 +89,6 @@
 #include <net80211/ieee80211_radiotap.h>
 #include <net80211/ieee80211_var.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
diff -r a17883466135 -r 292d90d96cfc sys/dev/cardbus/if_tlp_cardbus.c
--- a/sys/dev/cardbus/if_tlp_cardbus.c  Mon Jan 18 18:49:27 2010 +0000
+++ b/sys/dev/cardbus/if_tlp_cardbus.c  Mon Jan 18 18:52:35 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_cardbus.c,v 1.61 2009/04/17 10:20:32 cegger Exp $       */
+/*     $NetBSD: if_tlp_cardbus.c,v 1.62 2010/01/18 18:52:35 pooka Exp $        */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -36,10 +36,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.61 2009/04/17 10:20:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.62 2010/01/18 18:52:35 pooka Exp $");
 
 #include "opt_inet.h"
-#include "bpfilter.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -58,10 +57,6 @@
 #include <net/if_media.h>
 #include <net/if_ether.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>