From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 19:12:31 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AE581463;
 Wed, 26 Dec 2012 19:12:31 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 92DEC8FC0C;
 Wed, 26 Dec 2012 19:12:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQJCVqY024399;
 Wed, 26 Dec 2012 19:12:31 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQJCVtc024398;
 Wed, 26 Dec 2012 19:12:31 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201212261912.qBQJCVtc024398@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Wed, 26 Dec 2012 19:12:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244714 - head/sys/netgraph/bluetooth/drivers/ubt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 19:12:31 -0000

Author: rakuco (ports committer)
Date: Wed Dec 26 19:12:31 2012
New Revision: 244714
URL: http://svnweb.freebsd.org/changeset/base/244714

Log:
  Use the correct USB interface macros instead of USB_IF_CSI.
  
  As pointed out by hselasky@, USB_IF_CSI is the wrong macro here since we want
  to declare the device's interface class, subclass and protocol, not class,
  subclass and driver info.
  
  Follow-up to r244704.
  
  PR:		kern/174707
  Approved by:	glebius
  MFC after:	1 week

Modified:
  head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c

Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed Dec 26 18:51:37 2012	(r244713)
+++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed Dec 26 19:12:31 2012	(r244714)
@@ -401,7 +401,9 @@ static const STRUCT_USB_HOST_ID ubt_devs
 
 	/* Broadcom USB dongles, mostly BCM20702 and BCM20702A0 */
 	{ USB_VENDOR(USB_VENDOR_BROADCOM),
-	  USB_IF_CSI(UICLASS_VENDOR, 0x01, 0x01) },
+	  USB_IFACE_CLASS(UICLASS_VENDOR),
+	  USB_IFACE_SUBCLASS(UDSUBCLASS_RF),
+	  USB_IFACE_PROTOCOL(UDPROTO_BLUETOOTH) },
 };
 
 /*