From 14c32b5f40c5ee3bd5649c3737f359f7e65e6944 Mon Sep 17 00:00:00 2001 From: sam Date: Thu, 14 Nov 2002 23:54:55 +0000 Subject: network interface driver changes: o don't strip the Ethernet header from inbound packets; pass packets up the stack intact (required significant changes to some drivers) o reference common definitions in net/ethernet.h (e.g. ETHER_ALIGN) o track ether_ifattach/ether_ifdetach API changes o track bpf changes (use BPF_TAP and BPF_MTAP) o track vlan changes (ifnet capabilities, revised processing scheme, etc.) o use if_input to pass packets "up" o call ether_ioctl for default handling of ioctls Reviewed by: many Approved by: re --- sys/dev/sr/if_sr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sys/dev/sr') diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c index 0552b5a..18b5511 100644 --- a/sys/dev/sr/if_sr.c +++ b/sys/dev/sr/if_sr.c @@ -868,8 +868,7 @@ top_srstart: #endif #ifndef NETGRAPH - if (ifp->if_bpf) - bpf_mtap(ifp, mtx); + BPF_MTAP(ifp, mtx); #else /* NETGRAPH */ sc->outbytes += len; #endif /* NETGRAPH */ @@ -2126,8 +2125,7 @@ sr_get_packets(struct sr_softc *sc) sr_copy_rxbuf(m, sc, len); /* copy from DPRAM */ #ifndef NETGRAPH - if (ifp->if_bpf) - bpf_mtap(ifp, m); + BPF_MTAP(ifp, m); #if BUGGY > 3 { -- cgit v1.1