From e37f27be240bca3010ef47d17e1165d8dd9a0823 Mon Sep 17 00:00:00 2001 From: John Hay Date: Thu, 17 Apr 2003 17:51:24 +0000 Subject: [PATCH] Get wlread() closer to working. Use m->m_len as the initial value for bytes_in_mbuf rather than MCLBYTES. Add the ethertnet header to the front of the mbuf. Adjust bytes_in_mbuf inside the loop that reads the packet out of the card. --- sys/dev/wl/if_wl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c index 795afdf0c2c..83bc665c1c3 100644 --- a/sys/dev/wl/if_wl.c +++ b/sys/dev/wl/if_wl.c @@ -1119,7 +1119,14 @@ wlread(struct wl_softc *sc, u_short fd_p) */ mlen = 0; mb_p = mtod(m, u_char *); - bytes_in_mbuf = MCLBYTES; + bytes_in_mbuf = m->m_len; + + /* Put the ethernet header inside the mbuf. */ + bcopy(&fd.destination[0], mb_p, 14); + mb_p += 14; + mlen += 14; + bytes_in_mbuf -= 14; + bytes = min(bytes_in_mbuf, bytes_in_msg); for (;;) { if (bytes & 1) { @@ -1144,6 +1151,7 @@ wlread(struct wl_softc *sc, u_short fd_p) return 0; } mb_p += bytes; + bytes_in_mbuf -= bytes; bytes_in_msg -= bytes; if (bytes_in_msg == 0) { if (rbd.status & RBD_SW_EOF || rbd.next_rbd_offset == I82586NULL) {