From owner-svn-src-all@FreeBSD.ORG  Sun Apr  5 18:26:19 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5380106567D;
	Sun,  5 Apr 2009 18:26:19 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D36BD8FC13;
	Sun,  5 Apr 2009 18:26:19 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n35IQJR4028465;
	Sun, 5 Apr 2009 18:26:19 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n35IQJ8n028464;
	Sun, 5 Apr 2009 18:26:19 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200904051826.n35IQJ8n028464@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Sun, 5 Apr 2009 18:26:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190744 - head/sys/dev/usb/wlan
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Apr 2009 18:26:21 -0000

Author: thompsa
Date: Sun Apr  5 18:26:19 2009
New Revision: 190744
URL: http://svn.freebsd.org/changeset/base/190744

Log:
  Catch up with usb2_config struct layout changes.

Modified:
  head/sys/dev/usb/wlan/if_uath.c

Modified: head/sys/dev/usb/wlan/if_uath.c
==============================================================================
--- head/sys/dev/usb/wlan/if_uath.c	Sun Apr  5 18:22:13 2009	(r190743)
+++ head/sys/dev/usb/wlan/if_uath.c	Sun Apr  5 18:26:19 2009	(r190744)
@@ -208,50 +208,50 @@ static const struct usb2_config uath_usb
 		.type = UE_BULK,
 		.endpoint = 0x1,
 		.direction = UE_DIR_IN,
-		.mh.bufsize = UATH_MAX_CMDSZ,
-		.mh.flags = {
+		.bufsize = UATH_MAX_CMDSZ,
+		.flags = {
 			.pipe_bof = 1,
 			.short_xfer_ok = 1
 		},
-		.mh.callback = uath_intr_rx_callback
+		.callback = uath_intr_rx_callback
 	},
 	[UATH_INTR_TX] = {
 		.type = UE_BULK,
 		.endpoint = 0x1,
 		.direction = UE_DIR_OUT,
-		.mh.bufsize = UATH_MAX_CMDSZ,
-		.mh.flags = {
+		.bufsize = UATH_MAX_CMDSZ,
+		.flags = {
 			.ext_buffer = 1,
 			.force_short_xfer = 1,
 			.pipe_bof = 1,
 		},
-		.mh.callback = uath_intr_tx_callback,
-		.mh.timeout = UATH_CMD_TIMEOUT
+		.callback = uath_intr_tx_callback,
+		.timeout = UATH_CMD_TIMEOUT
 	},
 	[UATH_BULK_RX] = {
 		.type = UE_BULK,
 		.endpoint = 0x2,
 		.direction = UE_DIR_IN,
-		.mh.bufsize = MCLBYTES,
-		.mh.flags = {
+		.bufsize = MCLBYTES,
+		.flags = {
 			.ext_buffer = 1,
 			.pipe_bof = 1,
 			.short_xfer_ok = 1
 		},
-		.mh.callback = uath_bulk_rx_callback
+		.callback = uath_bulk_rx_callback
 	},
 	[UATH_BULK_TX] = {
 		.type = UE_BULK,
 		.endpoint = 0x2,
 		.direction = UE_DIR_OUT,
-		.mh.bufsize = UATH_MAX_TXBUFSZ,
-		.mh.flags = {
+		.bufsize = UATH_MAX_TXBUFSZ,
+		.flags = {
 			.ext_buffer = 1,
 			.force_short_xfer = 1,
 			.pipe_bof = 1
 		},
-		.mh.callback = uath_bulk_tx_callback,
-		.mh.timeout = UATH_DATA_TIMEOUT
+		.callback = uath_bulk_tx_callback,
+		.timeout = UATH_DATA_TIMEOUT
 	}
 };