Date: Mon, 27 Sep 1999 20:55:02 -0500 (CDT) From: Steve Price <sprice@hiwaay.net> To: freebsd-alpha@freebsd.org Cc: phk@freebsd.org Subject: Alpha kernel builds falling over Message-ID: <Pine.OSF.4.10.9909272041280.32266-100000@fly.HiWAAY.net>
next in thread | raw e-mail | index | archive | help
Hi all,
Anyone mind if I commit the following patch? The removal
of "NBPF conditionality" seems to have left kernel builds
falling over. The last 3 hunks accomodate interface changes
in the bpf* routines.
-steve
Index: am7990.c
===================================================================
RCS file: /home/ncvs/src/sys/alpha/tc/am7990.c,v
retrieving revision 1.6
diff -u -r1.6 am7990.c
--- am7990.c 1999/09/25 12:05:44 1.6
+++ am7990.c 1999/09/28 01:34:49
@@ -78,7 +78,6 @@
*/
#include "opt_inet.h"
-#include <net/bpf.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -103,6 +102,7 @@
#ifdef INET
#include <netinet/in.h>
#endif
+#include <net/bpf.h>
#include <net/ethernet.h>
#include <net/if_arp.h>
@@ -226,7 +226,7 @@
if_attach(ifp);
ether_ifattach(ifp);
- bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
+ bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
switch (sc->sc_memsize) {
case 8192:
@@ -563,7 +563,7 @@
* If so, hand off the raw packet to BPF.
*/
if (ifp->if_bpf) {
- bpf_mtap(ifp->if_bpf, m);
+ bpf_mtap(ifp, m);
#ifndef LANCE_REVC_BUG
/*
@@ -919,7 +919,7 @@
* before we commit it to the wire.
*/
if (ifp->if_bpf)
- bpf_mtap(ifp->if_bpf, m);
+ bpf_mtap(ifp, m);
/*
* Copy the mbuf chain into the transmit buffer.
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-alpha" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.OSF.4.10.9909272041280.32266-100000>