From owner-p4-projects@FreeBSD.ORG  Thu Jul  3 09:44:27 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 379C41065672; Thu,  3 Jul 2008 09:44:27 +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 EE0F1106566C
	for <perforce@FreeBSD.org>; Thu,  3 Jul 2008 09:44:26 +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 D6A438FC15
	for <perforce@FreeBSD.org>; Thu,  3 Jul 2008 09:44:26 +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 m639iQUu030982
	for <perforce@FreeBSD.org>; Thu, 3 Jul 2008 09:44:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m639iQ1W030980
	for perforce@freebsd.org; Thu, 3 Jul 2008 09:44:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 3 Jul 2008 09:44:26 GMT
Message-Id: <200807030944.m639iQ1W030980@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 144546 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: Thu, 03 Jul 2008 09:44:27 -0000

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

Change 144546 by hselasky@hselasky_laptop001 on 2008/07/03 09:43:46

	
	USB WLAN module related
	
	- add interface index checks in probe function.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#3 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#3 (text+ko) ====

@@ -427,6 +427,9 @@
 	if (uaa->info.bConfigIndex != 0) {
 		return (ENXIO);
 	}
+	if (uaa->info.bIfaceIndex != RT2573_IFACE_INDEX) {
+		return (ENXIO);
+	}
 	return (usb2_lookup_id_by_uaa(rum_devs, sizeof(rum_devs), uaa));
 }
 

==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#3 (text+ko) ====

@@ -420,6 +420,9 @@
 	if (uaa->info.bConfigIndex != 0) {
 		return (ENXIO);
 	}
+	if (uaa->info.bIfaceIndex != RAL_IFACE_INDEX) {
+		return (ENXIO);
+	}
 	return (usb2_lookup_id_by_uaa(ural_devs, sizeof(ural_devs), uaa));
 }
 

==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#3 (text+ko) ====

@@ -1036,6 +1036,9 @@
 	if (uaa->info.bConfigIndex != 0) {
 		return (ENXIO);
 	}
+	if (uaa->info.bIfaceIndex != ZYD_IFACE_INDEX) {
+		return (ENXIO);
+	}
 	return (usb2_lookup_id_by_uaa(zyd_devs, sizeof(zyd_devs), uaa));
 }