Convert the last remaining net-driver users of ether_input to ether_input_mbuf.

sgec ok martin@
if_ie ok miod@
if_de, if_hp not in GENERIC
ok brad@

1 files changed, 6 insertions, 15 deletions

diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 834ccca6789..11b5283716c 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.32 2006/03/25 22:41:44 djm Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.33 2006/04/16 00:46:32 pascoe Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $	*/
 
 /*-
@@ -1239,7 +1239,7 @@ ieget(sc, ehp, to_bpf)
 	int thisrboff, thismboff;
 	int head;
 
-	totlen = ie_packet_len(sc);
+	resid = totlen = ie_packet_len(sc);
 	if (totlen <= 0)
 		return 0;
 
@@ -1262,8 +1262,6 @@ ieget(sc, ehp, to_bpf)
 		return 0;
 	}
 
-	resid = totlen -= (thisrboff = sizeof *ehp);
-
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == 0)
 		return 0;
@@ -1298,6 +1296,7 @@ ieget(sc, ehp, to_bpf)
 	}
 
 	m = top;
+	thisrboff = 0;
 	thismboff = 0;
 
 	/*
@@ -1385,18 +1384,10 @@ ie_readframe(sc, num)
 #endif
 
 #if NBPFILTER > 0
-	/*
-	 * Check for a BPF filter; if so, hand it up.
-	 * Note that we have to stick an extra mbuf up front, because bpf_mtap
-	 * expects to have the ether header at the front.
-	 * It doesn't matter that this results in an ill-formatted mbuf chain,
-	 * since BPF just looks at the data.  (It doesn't try to free the mbuf,
-	 * tho' it will make a copy for tcpdump.)
-	 */
+	/* Check for a BPF filter; if so, hand it up. */
 	if (bpf_gets_it) {
 		/* Pass it up. */
-		bpf_mtap_hdr(sc->sc_arpcom.ac_if.if_bpf, (caddr_t)&eh,
-		    sizeof(eh), m, BPF_DIRECTION_IN);
+		bpf_mtap(sc->sc_arpcom.ac_if.if_bpf, m, BPF_DIRECTION_IN);
 
 		/*
 		 * A signal passed up from the filtering code indicating that
@@ -1422,7 +1413,7 @@ ie_readframe(sc, num)
 	/*
 	 * Finally pass this packet up to higher layers.
 	 */
-	ether_input(&sc->sc_arpcom.ac_if, &eh, m);
+	ether_input_mbuf(&sc->sc_arpcom.ac_if, m);
 	sc->sc_arpcom.ac_if.if_ipackets++;
 }