From owner-p4-projects@FreeBSD.ORG  Thu Aug 19 23:13:58 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 212DC1065698; Thu, 19 Aug 2010 23:13:58 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D71231065673
	for <perforce@FreeBSD.org>; Thu, 19 Aug 2010 23:13:57 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id C427C8FC1C
	for <perforce@FreeBSD.org>; Thu, 19 Aug 2010 23:13:57 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7JNDvdb027495
	for <perforce@FreeBSD.org>; Thu, 19 Aug 2010 23:13:57 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7JNDv8C027492
	for perforce@freebsd.org; Thu, 19 Aug 2010 23:13:57 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 19 Aug 2010 23:13:57 GMT
Message-Id: <201008192313.o7JNDv8C027492@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 182636 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 19 Aug 2010 23:13:58 -0000

http://p4web.freebsd.org/@@182636?ac=10

Change 182636 by hselasky@hselasky_laptop001 on 2010/08/19 23:13:23

	
	USB network:
		- correct maximum RX buffer size.
		- correct for execution on ARM (IP-header alignment)

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#4 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#4 (text+ko) ====

@@ -96,7 +96,7 @@
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_RX,
 		.frames = IPHETH_RX_FRAMES_MAX,
-		.bufsize = (IPHETH_RX_FRAMES_MAX * IPHETH_BUF_SIZE),
+		.bufsize = (IPHETH_RX_FRAMES_MAX * MCLBYTES),
 		.flags = {.short_frames_ok = 1,.short_xfer_ok = 1,.ext_buffer = 1,},
 		.callback = ipheth_bulk_read_callback,
 		.timeout = 0,		/* no timeout */
@@ -511,6 +511,10 @@
 				m = uether_newbuf();
 				if (m == NULL)
 					goto tr_stall;
+
+				/* cancel alignment for ethernet */
+				m_adj(m, ETHER_ALIGN);
+
 				sc->sc_rx_buf[x] = m;
 			} else {
 				m = sc->sc_rx_buf[x];