From 2ff3e319dc9ec224caadc9f0bed8dd306c78bc7a Mon Sep 17 00:00:00 2001
From: brooks <brooks@FreeBSD.org>
Date: Mon, 21 Oct 2002 05:05:43 +0000
Subject: Don't include the depricated "bpf.h" and always compile in bpf
 support as per current practice.

---
 sys/i4b/driver/i4b_ipr.c   | 12 +-----------
 sys/i4b/driver/i4b_isppp.c | 10 ----------
 2 files changed, 1 insertion(+), 21 deletions(-)

(limited to 'sys/i4b')

diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index f8283c2..92c0e98 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -96,12 +96,8 @@
 				/* undef to uncompress in the mbuf itself    */
 #endif /* IPR_VJ */
 
-#include "bpf.h"
-
-#if NBPFILTER > 0 || NBPF > 0
 #include <sys/time.h>
 #include <net/bpf.h>
-#endif
 
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_debug.h>
@@ -271,9 +267,7 @@ i4biprattach(void *dummy)
 		
 		if_attach(&sc->sc_if);
 
-#if NBPFILTER > 0 || NBPF > 0
 		bpfattach(&sc->sc_if, DLT_NULL, sizeof(u_int));
-#endif		
 	}
 }
 
@@ -299,7 +293,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 	
 	if(dst->sa_family != AF_INET)
 	{
-		printf("ipr%d: af%d not supported\n", (sc)->sc_if.if_unit, dst->sa_family);
+		if_printf(ifp, "af%d not supported\n", dst->sa_family);
 		m_freem(m);
 		splx(s);
 		sc->sc_if.if_noproto++;
@@ -874,7 +868,6 @@ error:
 	}
 #endif
 
-#if NBPFILTER > 0 || NBPF > 0
 	if(sc->sc_if.if_bpf)
 	{
 		/* prepend the address family as a four byte field */		
@@ -885,7 +878,6 @@ error:
 		mm.m_data = (char *)&af;
 		bpf_mtap(&sc->sc_if, &mm);
 	}
-#endif /* NBPFILTER > 0  || NBPF > 0 */
 
 	if(! IF_HANDOFF(&ipintrq, m, NULL))
 	{
@@ -933,7 +925,6 @@ ipr_tx_queue_empty(int unit)
 
 		microtime(&sc->sc_if.if_lastchange);
 		
-#if NBPFILTER > 0 || NBPF > 0
 		if(sc->sc_if.if_bpf)
 		{
 			/* prepend the address family as a four byte field */
@@ -945,7 +936,6 @@ ipr_tx_queue_empty(int unit)
 			mm.m_data = (char *)&af;
 			bpf_mtap(&sc->sc_if, &mm);
 		}
-#endif /* NBPFILTER */
 	
 #if I4BIPRACCT
 		sc->sc_outb += m->m_pkthdr.len;	/* size before compression */
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index 8485f23..54d100d 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -55,12 +55,8 @@
 #include <net/if_types.h>
 #include <net/if_sppp.h>
 
-#include "bpf.h"     
-
-#if NBPFILTER > 0 || NBPF > 0
 #include <sys/time.h>
 #include <net/bpf.h>
-#endif
 
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_debug.h>
@@ -230,9 +226,7 @@ i4bispppattach(void *dummy)
 
 		CALLOUT_INIT(&sc->sc_ch);
 		
-#if NBPFILTER > 0 || NBPF > 0
 		bpfattach(&sc->sc_if, DLT_PPP, PPP_HDRLEN);
-#endif		
 	}
 }
 
@@ -295,10 +289,8 @@ i4bisppp_start(struct ifnet *ifp)
 	while ((m = sppp_dequeue(&sc->sc_if)) != NULL)
 	{
 
-#if NBPFILTER > 0 || NBPF > 0
 		if (ifp->if_bpf)
 			bpf_mtap(ifp, m);
-#endif 
 
 		microtime(&ifp->if_lastchange);
 
@@ -589,10 +581,8 @@ i4bisppp_rx_data_rdy(int unit)
 	printf("i4bisppp_rx_data_ready: received packet!\n");
 #endif
 
-#if NBPFILTER > 0 || NBPF > 0
 	if(sc->sc_if.if_bpf)
 		bpf_mtap(&sc->sc_if, m);
-#endif
 
 	s = splimp();
 
-- 
cgit v1.1