summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2005-04-03 10:29:13 +0000
committerBrad Smith <brad@cvs.openbsd.org>2005-04-03 10:29:13 +0000
commitace44bc6478ccba5790f2166a294910735a8613c (patch)
tree7e0108e4f4330edccf3f20245de844d87e78f20f /sys/dev
parent3b2fda4cd88debd9786387351fffecdf23b67e66 (diff)
ether_input_mbuf() conversion.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/isa/if_ex.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c
index b2c9cc692b3..7b7ce403b16 100644
--- a/sys/dev/isa/if_ex.c
+++ b/sys/dev/isa/if_ex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ex.c,v 1.11 2005/04/02 03:20:26 brad Exp $ */
+/* $OpenBSD: if_ex.c,v 1.12 2005/04/03 10:29:12 brad Exp $ */
/*
* Copyright (c) 1997, Donald A. Schmidt
* Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
@@ -686,7 +686,6 @@ ex_rx_intr(sc)
register struct ifnet *ifp = &sc->arpcom.ac_if;
int rx_status, pkt_len, QQQ;
register struct mbuf *m, *ipkt;
- struct ether_header *eh;
DODEBUG(Start_End, printf("ex_rx_intr: start\n"););
/*
@@ -747,7 +746,6 @@ ex_rx_intr(sc)
m->m_len = MLEN;
}
}
- eh = mtod(ipkt, struct ether_header *);
#ifdef EXDEBUG
if (debug_mask & Rcvd_Pkts) {
if ((eh->ether_dhost[5] != 0xff) ||
@@ -761,8 +759,7 @@ ex_rx_intr(sc)
if (ifp->if_bpf != NULL)
bpf_mtap(ifp->if_bpf, ipkt);
#endif
- m_adj(ipkt, sizeof(struct ether_header));
- ether_input(ifp, eh, ipkt);
+ ether_input_mbuf(ifp, ipkt);
ifp->if_ipackets++;
}
} else