From owner-p4-projects@FreeBSD.ORG  Fri Jan 18 21:34:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5DA3E16A421; Fri, 18 Jan 2008 21:34:29 +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 2331616A41B
	for <perforce@FreeBSD.org>; Fri, 18 Jan 2008 21:34:29 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0874013C448
	for <perforce@FreeBSD.org>; Fri, 18 Jan 2008 21:34:29 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ILYSpo083261
	for <perforce@FreeBSD.org>; Fri, 18 Jan 2008 21:34:28 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ILYSvY083258
	for perforce@freebsd.org; Fri, 18 Jan 2008 21:34:28 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 18 Jan 2008 21:34:28 GMT
Message-Id: <200801182134.m0ILYSvY083258@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 133598 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: Fri, 18 Jan 2008 21:34:29 -0000

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

Change 133598 by hselasky@hselasky_laptop001 on 2008/01/18 21:33:26

	
	Bugfix: When searching for an alternate setting in CDC ethernet, start
	at the interface descriptor and not at the beginning of the config
	descriptor.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#49 edit

Differences ...

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

@@ -285,7 +285,6 @@
 	const usb_cdc_union_descriptor_t *ud;
 	const usb_cdc_ethernet_descriptor_t *ue;
 	const usb_interface_descriptor_t *id;
-	usb_descriptor_t *desc = NULL;
 	const struct cdce_type *t;
 	struct ifnet *ifp;
 	int error;
@@ -308,11 +307,15 @@
 	/* search for alternate settings */
 	if (uaa->usb_mode == USB_MODE_HOST) {
 
-		id = uaa->iface->idesc;
+		usb_descriptor_t *desc;
+		usb_config_descriptor_t *cd;
+
+		cd = usbd_get_config_descriptor(uaa->device);
+		desc = (void *)(uaa->iface->idesc);
+		id = (void *)desc;
 		i = id->bInterfaceNumber;
 		alt_index = 0;
-		while ((desc = usbd_desc_foreach(
-		    usbd_get_config_descriptor(uaa->device), desc))) {
+		while ((desc = usbd_desc_foreach(cd, desc))) {
 			id = (void *)desc;
 			if ((id->bDescriptorType == UDESC_INTERFACE) &&
 			    (id->bLength >= sizeof(*id))) {