Date: Sun, 16 Jul 2006 21:31:36 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 101725 for review Message-ID: <200607162131.k6GLVavn084685@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101725 Change 101725 by hselasky@hselasky_mini_itx on 2006/07/16 21:30:42 Bugfix: Make sure that incoming data is copied after the pre-pended frame type byte, if any. Affected files ... .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 (text+ko) ==== @@ -775,7 +775,8 @@ xfer->actlen = max_len; } - bcopy(xfer->buffer, m->m_data, xfer->actlen); + bcopy(xfer->buffer, ((u_int8_t *)(m->m_data)) + m->m_len, + xfer->actlen); m->m_pkthdr.len += xfer->actlen; m->m_len += xfer->actlen; @@ -945,7 +946,8 @@ xfer->actlen = max_len; } - bcopy(xfer->buffer, m->m_data, xfer->actlen); + bcopy(xfer->buffer, ((u_int8_t *)(m->m_data)) + m->m_len, + xfer->actlen); m->m_pkthdr.len += xfer->actlen; m->m_len += xfer->actlen; @@ -1228,7 +1230,8 @@ xfer->frlengths[n] = max_len; } - bcopy(buf, m->m_data, xfer->frlengths[n]); + bcopy(buf, ((u_int8_t *)(m->m_data)) + m->m_len, + xfer->frlengths[n]); m->m_pkthdr.len += xfer->frlengths[n]; m->m_len += xfer->frlengths[n]; ==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#3 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607162131.k6GLVavn084685>