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

1 files changed, 6 insertions, 6 deletions

diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 6510e74..064bb68 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -189,9 +189,10 @@ pdq_os_receive_pdu(
     int drop)
 {
     pdq_softc_t *sc = pdq->pdq_os_ctx;
+    struct ifnet *ifp = &sc->sc_if;
     struct fddi_header *fh;
 
-    sc->sc_if.if_ipackets++;
+    ifp->if_ipackets++;
 #if defined(PDQ_BUS_DMA)
     {
 	/*
@@ -217,15 +218,14 @@ pdq_os_receive_pdu(
 #endif
     fh = mtod(m, struct fddi_header *);
     if (drop || (fh->fddi_fc & (FDDIFC_L|FDDIFC_F)) != FDDIFC_LLC_ASYNC) {
-	sc->sc_if.if_iqdrops++;
-	sc->sc_if.if_ierrors++;
+	ifp->if_iqdrops++;
+	ifp->if_ierrors++;
 	PDQ_OS_DATABUF_FREE(pdq, m);
 	return;
     }
 
-    m_adj(m, FDDI_HDR_LEN);
-    m->m_pkthdr.rcvif = &sc->sc_if;
-    fddi_input(&sc->sc_if, fh, m);
+    m->m_pkthdr.rcvif = ifp;
+    (*ifp->if_input)(ifp, m);
 }
 
 void