diff options
| author | jhay <jhay@FreeBSD.org> | 2003-04-17 17:51:24 +0000 |
|---|---|---|
| committer | jhay <jhay@FreeBSD.org> | 2003-04-17 17:51:24 +0000 |
| commit | 6291491e7c1844a09a7fc2f0f4cde75de82640cd (patch) | |
| tree | fe07575dcd44cd6ba3b854242b43750f3ae8b722 /sys/dev/wl | |
| parent | d0e23a2bfcc0421f2ed392e5c10d0a9fa6eaef05 (diff) | |
| download | FreeBSD-src-6291491e7c1844a09a7fc2f0f4cde75de82640cd.zip FreeBSD-src-6291491e7c1844a09a7fc2f0f4cde75de82640cd.tar.gz | |
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.
Diffstat (limited to 'sys/dev/wl')
| -rw-r--r-- | sys/dev/wl/if_wl.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c index 795afdf..83bc665 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) { |
