diff options
| author | julian <julian@FreeBSD.org> | 2003-05-10 21:44:42 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 2003-05-10 21:44:42 +0000 |
| commit | dc5734d94b071df224b65d45b95d9ae7c5d563ab (patch) | |
| tree | ed7d8caf163274b56933e0b801c52beb10b3260d /sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h | |
| parent | 9e09746efa5431d5af0baf849575917d37cfdb76 (diff) | |
| download | FreeBSD-src-dc5734d94b071df224b65d45b95d9ae7c5d563ab.zip FreeBSD-src-dc5734d94b071df224b65d45b95d9ae7c5d563ab.tar.gz | |
Part one of undating the bluetooth code to the newest version
Submitted by: Maksim Yevmenkin <m_evmenkin@yahoo.com>
Approved by: re@
Diffstat (limited to 'sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h')
| -rw-r--r-- | sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h index d107ad6..ed8e84f 100644 --- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h +++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ng_l2cap_cmds.h,v 1.9 2002/04/16 00:43:56 max Exp $ + * $Id: ng_l2cap_cmds.h,v 1.4 2003/04/01 18:15:26 max Exp $ * $FreeBSD$ */ @@ -152,9 +152,11 @@ do { \ c->param.dcid = htole16((_dcid)); \ c->param.flags = htole16((_flags)); \ if ((_data) != NULL) { \ + int l = (_data)->m_pkthdr.len; \ + \ m_cat((_m), (_data)); \ - c->hdr.length += (_data)->m_pkthdr.len; \ - (_m)->m_pkthdr.len += (_data)->m_pkthdr.len; \ + c->hdr.length += l; \ + (_m)->m_pkthdr.len += l; \ } \ \ c->hdr.length = htole16(c->hdr.length); \ @@ -185,9 +187,11 @@ do { \ c->param.flags = htole16((_flags)); \ c->param.result = htole16((_result)); \ if ((_data) != NULL) { \ + int l = (_data)->m_pkthdr.len; \ + \ m_cat((_m), (_data)); \ - c->hdr.length += (_data)->m_pkthdr.len; \ - (_m)->m_pkthdr.len += (_data)->m_pkthdr.len; \ + c->hdr.length += l; \ + (_m)->m_pkthdr.len += l; \ } \ \ c->hdr.length = htole16(c->hdr.length); \ |
