summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorpooka <pooka@NetBSD.org>2010-01-17 19:45:06 +0000
committerpooka <pooka@NetBSD.org>2010-01-17 19:45:06 +0000
commit64da563d9007f36b9c5ea20a3fcbf552aa781f28 (patch)
treed0915be7017c403e41299cd0d82b936b76b0e9ef /sys/dev
parentd0d86c817a7309ca5e9ef1be04f43e5436391a66 (diff)
Forward declare struct bpf_if and use that as the type for bpf_if
instead of "void *". Buys us oo times the type-safety for 0 times the price. (no functional change)
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/anvar.h4
-rw-r--r--sys/dev/ic/athvar.h4
-rw-r--r--sys/dev/ic/atwvar.h4
-rw-r--r--sys/dev/ic/pdqvar.h4
-rw-r--r--sys/dev/ic/rt2560var.h4
-rw-r--r--sys/dev/ic/rt2661var.h4
-rw-r--r--sys/dev/ic/rtwvar.h4
-rw-r--r--sys/dev/ic/wivar.h4
-rw-r--r--sys/dev/pci/if_iwnvar.h4
-rw-r--r--sys/dev/pci/if_wpivar.h4
-rw-r--r--sys/dev/usb/if_rumvar.h4
-rw-r--r--sys/dev/usb/if_uralvar.h4
-rw-r--r--sys/dev/usb/if_zydreg.h4
13 files changed, 26 insertions, 26 deletions
diff --git a/sys/dev/ic/anvar.h b/sys/dev/ic/anvar.h
index 8a9753f5af2..3b57e899f73 100644
--- a/sys/dev/ic/anvar.h
+++ b/sys/dev/ic/anvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: anvar.h,v 1.19 2009/11/12 19:28:59 dyoung Exp $ */
+/* $NetBSD: anvar.h,v 1.20 2010/01/17 19:45:06 pooka Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -146,7 +146,7 @@ struct an_softc {
} sc_buf;
/* radiotap header */
- void * sc_drvbpf;
+ struct bpf_if * sc_drvbpf;
union {
struct an_rx_radiotap_header tap;
u_int8_t pad[64];
diff --git a/sys/dev/ic/athvar.h b/sys/dev/ic/athvar.h
index f6013a73f79..63d8649c3ff 100644
--- a/sys/dev/ic/athvar.h
+++ b/sys/dev/ic/athvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: athvar.h,v 1.29 2009/09/16 16:34:50 dyoung Exp $ */
+/* $NetBSD: athvar.h,v 1.30 2010/01/17 19:45:06 pooka Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -243,7 +243,7 @@ struct ath_softc {
u_int16_t sc_ledoff; /* off time for current blink */
struct callout sc_ledtimer; /* led off timer */
- void * sc_drvbpf;
+ struct bpf_if * sc_drvbpf;
union {
struct ath_tx_radiotap_header th;
u_int8_t pad[64];
diff --git a/sys/dev/ic/atwvar.h b/sys/dev/ic/atwvar.h
index 05e7ce88915..48fe78ec529 100644
--- a/sys/dev/ic/atwvar.h
+++ b/sys/dev/ic/atwvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atwvar.h,v 1.34 2010/01/08 20:02:39 dyoung Exp $ */
+/* $NetBSD: atwvar.h,v 1.35 2010/01/17 19:45:06 pooka Exp $ */
/*
* Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. All rights reserved.
@@ -200,7 +200,7 @@ struct atw_softc {
u_int16_t *sc_srom;
u_int16_t sc_sromsz;
- void * sc_radiobpf;
+ struct bpf_if * sc_radiobpf;
bus_dma_segment_t sc_cdseg; /* control data memory */
int sc_cdnseg; /* number of segments */
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h
index 602f541c386..20802b3ef09 100644
--- a/sys/dev/ic/pdqvar.h
+++ b/sys/dev/ic/pdqvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pdqvar.h,v 1.41 2009/03/18 16:00:18 cegger Exp $ */
+/* $NetBSD: pdqvar.h,v 1.42 2010/01/17 19:45:06 pooka Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -348,7 +348,7 @@ typedef struct _pdq_os_ctx_t {
#if !defined(__bsdi__) || _BSDI_VERSION >= 199401
#define sc_bpf sc_if.if_bpf
#else
- void *sc_bpf;
+ struct bpf_if *sc_bpf;
#endif
#if defined(PDQ_BUS_DMA)
#if !defined(__NetBSD__)
diff --git a/sys/dev/ic/rt2560var.h b/sys/dev/ic/rt2560var.h
index 23acf28d946..e92f064e931 100644
--- a/sys/dev/ic/rt2560var.h
+++ b/sys/dev/ic/rt2560var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2560var.h,v 1.6 2007/12/09 20:27:58 jmcneill Exp $ */
+/* $NetBSD: rt2560var.h,v 1.7 2010/01/17 19:45:06 pooka Exp $ */
/* $OpenBSD: rt2560var.h,v 1.2 2006/01/14 12:43:27 damien Exp $ */
/*-
@@ -150,7 +150,7 @@ struct rt2560_softc {
int dwelltime;
#if NBPFILTER > 0
- void * sc_drvbpf;
+ struct bpf_if * sc_drvbpf;
union {
struct rt2560_rx_radiotap_header th;
diff --git a/sys/dev/ic/rt2661var.h b/sys/dev/ic/rt2661var.h
index e5556f2378c..a73f53c548d 100644
--- a/sys/dev/ic/rt2661var.h
+++ b/sys/dev/ic/rt2661var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2661var.h,v 1.8 2008/04/29 22:21:45 scw Exp $ */
+/* $NetBSD: rt2661var.h,v 1.9 2010/01/17 19:45:06 pooka Exp $ */
/* $OpenBSD: rt2661var.h,v 1.4 2006/02/25 12:56:47 damien Exp $ */
/*-
@@ -159,7 +159,7 @@ struct rt2661_softc {
uint8_t bbp64;
#if NBPFILTER > 0
- void * sc_drvbpf;
+ struct bpf_if * sc_drvbpf;
union {
struct rt2661_rx_radiotap_header th;
diff --git a/sys/dev/ic/rtwvar.h b/sys/dev/ic/rtwvar.h
index c9690531cb7..0cc8c212406 100644
--- a/sys/dev/ic/rtwvar.h
+++ b/sys/dev/ic/rtwvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwvar.h,v 1.40 2010/01/08 20:02:39 dyoung Exp $ */
+/* $NetBSD: rtwvar.h,v 1.41 2010/01/17 19:45:06 pooka Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -458,7 +458,7 @@ struct rtw_softc {
struct rtw_mtbl sc_mtbl;
- void * sc_radiobpf;
+ struct bpf_if * sc_radiobpf;
struct callout sc_scan_ch;
u_int sc_cur_chan;
diff --git a/sys/dev/ic/wivar.h b/sys/dev/ic/wivar.h
index 7494c2e6bad..e310601edab 100644
--- a/sys/dev/ic/wivar.h
+++ b/sys/dev/ic/wivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wivar.h,v 1.62 2009/05/12 14:25:18 cegger Exp $ */
+/* $NetBSD: wivar.h,v 1.63 2010/01/17 19:45:06 pooka Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -102,7 +102,7 @@ struct wi_softc {
bus_space_tag_t sc_iot; /* bus cookie */
bus_space_handle_t sc_ioh; /* bus i/o handle */
- void * sc_drvbpf;
+ struct bpf_if * sc_drvbpf;
int sc_flags;
int sc_bap_id;
int sc_bap_off;
diff --git a/sys/dev/pci/if_iwnvar.h b/sys/dev/pci/if_iwnvar.h
index 76648034b05..29526e62bec 100644
--- a/sys/dev/pci/if_iwnvar.h
+++ b/sys/dev/pci/if_iwnvar.h
@@ -1,5 +1,5 @@
/* $OpenBSD: if_iwnvar.h,v 1.8 2008/12/03 17:17:08 damien Exp $ */
-/* $NetBSD: if_iwnvar.h,v 1.6 2009/09/11 01:28:20 christos Exp $ */
+/* $NetBSD: if_iwnvar.h,v 1.7 2010/01/17 19:45:06 pooka Exp $ */
/*-
* Copyright (c) 2007, 2008
@@ -288,7 +288,7 @@ struct iwn_softc {
void *powerhook;
#if NBPFILTER > 0
- void * sc_drvbpf;
+ struct bpf_if * sc_drvbpf;
union {
struct iwn_rx_radiotap_header th;
diff --git a/sys/dev/pci/if_wpivar.h b/sys/dev/pci/if_wpivar.h
index 9dee761d026..2ed308a4808 100644
--- a/sys/dev/pci/if_wpivar.h
+++ b/sys/dev/pci/if_wpivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpivar.h,v 1.13 2008/11/12 18:23:08 joerg Exp $ */
+/* $NetBSD: if_wpivar.h,v 1.14 2010/01/17 19:45:06 pooka Exp $ */
/*-
* Copyright (c) 2006
@@ -170,7 +170,7 @@ struct wpi_softc {
int sc_tx_timer;
#if NBPFILTER > 0
- void * sc_drvbpf;
+ struct bpf_if * sc_drvbpf;
union {
struct wpi_rx_radiotap_header th;
diff --git a/sys/dev/usb/if_rumvar.h b/sys/dev/usb/if_rumvar.h
index 314b619f9bc..8ce8c381f1d 100644
--- a/sys/dev/usb/if_rumvar.h
+++ b/sys/dev/usb/if_rumvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rumvar.h,v 1.5 2009/05/29 18:49:21 plunky Exp $ */
+/* $NetBSD: if_rumvar.h,v 1.6 2010/01/17 19:45:06 pooka Exp $ */
/* $OpenBSD: if_rumvar.h,v 1.7 2006/11/13 20:06:38 damien Exp $ */
/*-
@@ -135,7 +135,7 @@ struct rum_softc {
uint8_t bbp17;
#if NBPFILTER > 0
- void * sc_drvbpf;
+ struct bpf_if * sc_drvbpf;
union {
struct rum_rx_radiotap_header th;
diff --git a/sys/dev/usb/if_uralvar.h b/sys/dev/usb/if_uralvar.h
index afa10fe083f..a74e876a4b6 100644
--- a/sys/dev/usb/if_uralvar.h
+++ b/sys/dev/usb/if_uralvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_uralvar.h,v 1.8 2007/06/09 12:13:12 kiyohara Exp $ */
+/* $NetBSD: if_uralvar.h,v 1.9 2010/01/17 19:45:06 pooka Exp $ */
/* $OpenBSD: if_ralvar.h,v 1.2 2005/05/13 18:42:50 damien Exp $ */
/*-
@@ -125,7 +125,7 @@ struct ural_softc {
int nb_ant;
#if NBPFILTER > 0
- void * sc_drvbpf;
+ struct bpf_if * sc_drvbpf;
union {
struct ural_rx_radiotap_header th;
diff --git a/sys/dev/usb/if_zydreg.h b/sys/dev/usb/if_zydreg.h
index b30c62677f8..1e8753ddb55 100644
--- a/sys/dev/usb/if_zydreg.h
+++ b/sys/dev/usb/if_zydreg.h
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $ */
-/* $NetBSD: if_zydreg.h,v 1.2 2007/06/16 11:18:45 kiyohara Exp $ */
+/* $NetBSD: if_zydreg.h,v 1.3 2010/01/17 19:45:06 pooka Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -1219,7 +1219,7 @@ struct zyd_softc {
int tx_timer;
#if NBPFILTER > 0
- void * sc_drvbpf;
+ struct bpf_if * sc_drvbpf;
union {
struct zyd_rx_radiotap_header th;