From owner-svn-src-all@FreeBSD.ORG  Tue Sep 14 00:32:29 2010
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 CB5A6106566B;
	Tue, 14 Sep 2010 00:32:29 +0000 (UTC)
	(envelope-from emax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B97F48FC08;
	Tue, 14 Sep 2010 00:32:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8E0WTWV046954;
	Tue, 14 Sep 2010 00:32:29 GMT (envelope-from emax@svn.freebsd.org)
Received: (from emax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8E0WTvV046952;
	Tue, 14 Sep 2010 00:32:29 GMT (envelope-from emax@svn.freebsd.org)
Message-Id: <201009140032.o8E0WTvV046952@svn.freebsd.org>
From: Maksim Yevmenkin <emax@FreeBSD.org>
Date: Tue, 14 Sep 2010 00:32:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212587 - stable/8/usr.sbin/bluetooth/bthidcontrol
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: Tue, 14 Sep 2010 00:32:29 -0000

Author: emax
Date: Tue Sep 14 00:32:29 2010
New Revision: 212587
URL: http://svn.freebsd.org/changeset/base/212587

Log:
  MFC r212296
  
  Do not request SDP attributes using ranges.
  Apparently some devices do not like it.
  
  Tested by:	Buganini < buganini at gmail dot com >

Modified:
  stable/8/usr.sbin/bluetooth/bthidcontrol/sdp.c
Directory Properties:
  stable/8/usr.sbin/bluetooth/bthidcontrol/   (props changed)

Modified: stable/8/usr.sbin/bluetooth/bthidcontrol/sdp.c
==============================================================================
--- stable/8/usr.sbin/bluetooth/bthidcontrol/sdp.c	Mon Sep 13 22:50:05 2010	(r212586)
+++ stable/8/usr.sbin/bluetooth/bthidcontrol/sdp.c	Tue Sep 14 00:32:29 2010	(r212587)
@@ -54,7 +54,9 @@ SDP_ATTR_RANGE(	SDP_ATTR_PROTOCOL_DESCRI
 SDP_ATTR_RANGE	(SDP_ATTR_ADDITIONAL_PROTOCOL_DESCRIPTOR_LISTS,
 		SDP_ATTR_ADDITIONAL_PROTOCOL_DESCRIPTOR_LISTS),
 SDP_ATTR_RANGE(	0x0205,		/* HIDReconnectInitiate */
-		0x0206),	/* HIDDescriptorList */
+		0x0205),
+SDP_ATTR_RANGE(	0x0206,		/* HIDDescriptorList */
+		0x0206),
 SDP_ATTR_RANGE(	0x0209,		/* HIDBatteryPower */
 		0x0209),
 SDP_ATTR_RANGE(	0x020d,		/* HIDNormallyConnectable */
@@ -149,7 +151,7 @@ hid_sdp_query(bdaddr_t const *local, str
 	}
 
 	if (control_psm == -1 || interrupt_psm == -1 ||
-	    reconnect_initiate == -1 || normally_connectable == -1 ||
+	    reconnect_initiate == -1 ||
 	    hid_descriptor == NULL || hid_descriptor_length == -1)
 		hid_sdp_query_exit(ENOATTR);