summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2001-07-10 02:16:12 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2001-07-10 02:16:12 +0000
commit20a7552bf3ba1972341944e79767cf2ef36c9534 (patch)
tree1d1f2ec0b836da5b3611d4d90ebd5761f3e24dbd /sys/arch
parent5a04cd5f7b98e86f9152b5040a73e4d0d93f6bed (diff)
ether_input_mbuf() conversion; thanks to drahn@ for testing.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/powerpc/mac/if_bm.c9
-rw-r--r--sys/arch/powerpc/mac/if_gm.c5
2 files changed, 4 insertions, 10 deletions
diff --git a/sys/arch/powerpc/mac/if_bm.c b/sys/arch/powerpc/mac/if_bm.c
index ac161f76a26..bb2c8846e89 100644
--- a/sys/arch/powerpc/mac/if_bm.c
+++ b/sys/arch/powerpc/mac/if_bm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bm.c,v 1.8 2001/07/09 03:30:20 mickey Exp $ */
+/* $OpenBSD: if_bm.c,v 1.9 2001/07/10 02:16:11 fgsch Exp $ */
/* $NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $ */
/*-
@@ -536,12 +536,7 @@ bmac_rint(v)
bpf_mtap(ifp->if_bpf, m);
#endif
#ifdef __OpenBSD__
-#if 0
- ether_input(ifp, mtod(m, struct ether_header *), m);
-#else
- m_adj(m, sizeof(struct ether_header));
- ether_input(ifp, data, m);
-#endif
+ ether_input_mbuf(ifp, m);
#else
m_adj(m, sizeof(struct ether_header));
ether_input(ifp, data, m);
diff --git a/sys/arch/powerpc/mac/if_gm.c b/sys/arch/powerpc/mac/if_gm.c
index e9d6ea5dd11..33395a8956b 100644
--- a/sys/arch/powerpc/mac/if_gm.c
+++ b/sys/arch/powerpc/mac/if_gm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gm.c,v 1.16 2001/07/09 03:30:20 mickey Exp $ */
+/* $OpenBSD: if_gm.c,v 1.17 2001/07/10 02:16:11 fgsch Exp $ */
/* $NetBSD: if_gm.c,v 1.2 2000/03/04 11:17:00 tsubai Exp $ */
/*-
@@ -501,8 +501,7 @@ gmac_rint(sc)
bpf_tap(ifp->if_bpf, sc->sc_rxbuf[i], len);
#endif
#ifdef __OpenBSD__
- m_adj(m, sizeof(struct ether_header));
- ether_input(ifp,(void*) sc->sc_rxbuf[i], m);
+ ether_input_mbuf(ifp, m);
#else /* !__OpenBSD__ */
(*ifp->if_input)(ifp, m);
#endif /* !__OpenBSD__ */