diff options
| -rw-r--r-- | sys/dev/ic/ath.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/if_atu.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/if_cdce.c | 4 | ||||
| -rw-r--r-- | sys/net/if_pfsync.c | 6 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 5 |
5 files changed, 14 insertions, 9 deletions
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c index 6e45823b46c..ca7b959ed7b 100644 --- a/sys/dev/ic/ath.c +++ b/sys/dev/ic/ath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ath.c,v 1.45 2006/01/04 06:04:41 canacar Exp $ */ +/* $OpenBSD: ath.c,v 1.46 2006/02/20 20:12:13 damien Exp $ */ /* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */ /*- @@ -2735,6 +2735,7 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan) return EIO; } +#if NBPFILTER > 0 /* * Update BPF state. */ @@ -2742,6 +2743,7 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan) htole16(chan->ic_freq); sc->sc_txtap.wt_chan_flags = sc->sc_rxtap.wr_chan_flags = htole16(chan->ic_flags); +#endif /* * Change channels and update the h/w rate map diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index c6c5c29f014..3b0c96cebd1 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.67 2006/01/29 03:22:52 brad Exp $ */ +/* $OpenBSD: if_atu.c,v 1.68 2006/02/20 20:12:14 damien Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -1843,7 +1843,9 @@ atu_tx_start(struct atu_softc *sc, struct ieee80211_node *ni, struct atu_tx_hdr *h; usbd_status err; u_int8_t pad; +#if NBPFILTER > 0 struct ieee80211com *ic = &sc->sc_ic; +#endif DPRINTFN(25, ("%s: atu_tx_start\n", USBDEVNAME(sc->atu_dev))); diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c index e5f1b640461..2a101791580 100644 --- a/sys/dev/usb/if_cdce.c +++ b/sys/dev/usb/if_cdce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdce.c,v 1.13 2006/01/29 03:22:52 brad Exp $ */ +/* $OpenBSD: if_cdce.c,v 1.14 2006/02/20 20:12:13 damien Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com> @@ -55,8 +55,8 @@ #include <net/if.h> #include <net/if_dl.h> -#if NBPFILTER > 0 #include <net/bpf.h> +#if NBPFILTER > 0 #define BPF_MTAP(ifp, m) bpf_mtap((ifp)->if_bpf, (m)) #endif diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index b72daed2958..381d3999a6f 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.59 2005/11/04 08:24:14 mcbride Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.60 2006/02/20 20:12:14 damien Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -1438,7 +1438,9 @@ pfsync_bulkfail(void *v) int pfsync_sendout(struct pfsync_softc *sc) { +#if NBPFILTER > 0 struct ifnet *ifp = &sc->sc_if; +#endif struct mbuf *m; timeout_del(&sc->sc_tmo); @@ -1467,7 +1469,9 @@ pfsync_sendout(struct pfsync_softc *sc) int pfsync_tdb_sendout(struct pfsync_softc *sc) { +#if NBPFILTER > 0 struct ifnet *ifp = &sc->sc_if; +#endif struct mbuf *m; timeout_del(&sc->sc_tdb_tmo); diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 15474db3944..0ddbeb29311 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_output.c,v 1.14 2006/01/11 00:18:17 millert Exp $ */ +/* $OpenBSD: ieee80211_output.c,v 1.15 2006/02/20 20:12:14 damien Exp $ */ /* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */ /*- @@ -53,10 +53,7 @@ #include <net/if_media.h> #include <net/if_arp.h> #include <net/if_llc.h> - -#if NBPFILTER > 0 #include <net/bpf.h> -#endif #ifdef INET #include <netinet/in.h> |