From owner-p4-projects@FreeBSD.ORG  Sun Jul 16 21:31:37 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1FC7B16A4E0; Sun, 16 Jul 2006 21:31:37 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D8AA116A4DD
	for <perforce@FreeBSD.org>; Sun, 16 Jul 2006 21:31:36 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A242443D45
	for <perforce@FreeBSD.org>; Sun, 16 Jul 2006 21:31:36 +0000 (GMT)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6GLVa3j084688
	for <perforce@FreeBSD.org>; Sun, 16 Jul 2006 21:31:36 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6GLVavn084685
	for perforce@freebsd.org; Sun, 16 Jul 2006 21:31:36 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 16 Jul 2006 21:31:36 GMT
Message-Id: <200607162131.k6GLVavn084685@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 101725 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Jul 2006 21:31:37 -0000

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) ====