From d9bc6e4f98d724d88c68f919d07f5f501aa0a274 Mon Sep 17 00:00:00 2001 From: sommerfeld Date: Thu, 4 Nov 1999 18:43:42 +0000 Subject: [PATCH] Conditionalize so this builds on 1.4.x.. --- sys/dev/ic/awi.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c index adbc0e1882b7..5826e4bfdc52 100644 --- a/sys/dev/ic/awi.c +++ b/sys/dev/ic/awi.c @@ -844,7 +844,6 @@ awi_rcv_data (sc, m) m_adj(m, sizeof(struct awi_mac_header) + sizeof(struct awi_llc_header) - sizeof(struct ether_header)); - m->m_flags |= M_HASFCS; #if NBPFILTER > 0 /* @@ -854,7 +853,18 @@ awi_rcv_data (sc, m) bpf_mtap(ifp->if_bpf, m); #endif +#if __NetBSD_Version__ > 104010000 + m->m_flags |= M_HASFCS; (*ifp->if_input)(ifp, m); +#else + { + struct ether_header *eh; + eh = mtod(m, struct ether_header *); + m_adj(m, sizeof(*eh)); + m_adj(m, -ETHER_CRC_LEN); + ether_input(ifp, eh, m); + } +#endif return; drop: m_freem(m); @@ -1775,7 +1785,9 @@ int awi_attach (sc) if_attach(ifp); /* Defer ether_ifattach, bpfattach until we get enaddr. */ ifp->if_output = awi_drop_output; +#if __NetBSD_Version__ > 104010000 ifp->if_input = awi_drop_input; +#endif #if NBPFILTER > 0 bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));