From owner-p4-projects@FreeBSD.ORG  Mon May 28 17:34:27 2007
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 9FB2516A52B; Mon, 28 May 2007 17:34:27 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 77A4E16A4FF
	for <perforce@FreeBSD.org>; Mon, 28 May 2007 17:34:27 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 680BD13C465
	for <perforce@FreeBSD.org>; Mon, 28 May 2007 17:34:27 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4SHYRJh032995
	for <perforce@FreeBSD.org>; Mon, 28 May 2007 17:34:27 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4SHYRo9032989
	for perforce@freebsd.org; Mon, 28 May 2007 17:34:27 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 28 May 2007 17:34:27 GMT
Message-Id: <200705281734.l4SHYRo9032989@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 120505 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: Mon, 28 May 2007 17:34:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=120505

Change 120505 by hselasky@hselasky_mini_itx on 2007/05/28 17:34:13

	Set Max Frame Burst to 2048 bytes, hence some chips do
	not support a higher value. This affects "AX88178" and
	"AX88772" based chips only.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#26 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#26 (text+ko) ====

@@ -243,7 +243,10 @@
       .type      = UE_BULK,
       .endpoint  = -1, /* any */
       .direction = UE_DIR_IN,
-      .bufsize   = AXE_BULK_BUF_SIZE,
+#if (MCLBYTES < 2048)
+#error "(MCLBYTES < 2048)"
+#endif
+      .bufsize   = MCLBYTES,
       .flags     = (USBD_USE_DMA|USBD_SHORT_XFER_OK),
       .callback  = &axe_bulk_read_callback,
       .timeout   = 0, /* no timeout */
@@ -698,12 +701,6 @@
 
 	sc->sc_flags |= AXE_FLAG_WAIT_LINK;
 
-	/* correct maximum bulk-receive length */
-
-	sc->sc_xfer[1]->length = 
-	  (sc->sc_flags & (AXE_FLAG_772|AXE_FLAG_178)) ?
-	  AXE_BULK_BUF_SIZE : MIN(MCLBYTES, AXE_BULK_BUF_SIZE);
-
 	/* start setup */
 
 	usbd_config_td_queue_command
@@ -1454,7 +1451,7 @@
 	/* Enable receiver, set RX mode */
 	rxmode = (AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE);
 	if (sc->sc_flags & (AXE_FLAG_178|AXE_FLAG_772)) {
-	    rxmode |= AXE_178_RXCMD_MFB_16384; /* default */
+	    rxmode |= AXE_178_RXCMD_MFB_2048; /* chip default */
 	} else {
 	    rxmode |= AXE_172_RXCMD_UNICAST;
 	}