Return-Path: From: Guillaume Bedot To: BlueZ development In-Reply-To: <1201509807.7254.7.camel@localhost> References: <1201336771.22866.7.camel@littletux> <1201338089.22866.14.camel@littletux> <1201341845.7769.11.camel@localhost> <1201509807.7254.7.camel@localhost> Content-Type: multipart/mixed; boundary="=-9XD85jEIyvacT13OzL2D" Date: Mon, 28 Jan 2008 15:52:26 +0100 Message-Id: <1201531946.7254.17.camel@localhost> Mime-Version: 1.0 Subject: Re: [Bluez-devel] [PATCH] HT820, capture and eSCO Reply-To: BlueZ development List-Id: BlueZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: bluez-devel-bounces@lists.sourceforge.net Errors-To: bluez-devel-bounces@lists.sourceforge.net --=-9XD85jEIyvacT13OzL2D Content-Type: text/plain Content-Transfer-Encoding: 7bit Re, New version of the patch with some unneeded lines removed. Regards, Guillaume B. --=-9XD85jEIyvacT13OzL2D Content-Disposition: attachment; filename=kernel-2.6.24-check-both-ends-for-esco-feature-v2.patch Content-Type: text/x-patch; name=kernel-2.6.24-check-both-ends-for-esco-feature-v2.patch; charset=UTF-8 Content-Transfer-Encoding: 7bit --- net/bluetooth/hci_conn.c.orig 2008-01-28 09:15:50.000000000 +0100 +++ net/bluetooth/hci_conn.c 2008-01-28 09:25:19.000000000 +0100 @@ -332,6 +332,8 @@ if (type == ACL_LINK) return acl; + if (lmp_esco_capable(hdev) && lmp_esco_capable(acl)) + type=ESCO_LINK; if (!(sco = hci_conn_hash_lookup_ba(hdev, type, dst))) { if (!(sco = hci_conn_add(hdev, type, dst))) { hci_conn_put(acl); @@ -346,7 +351,7 @@ if (acl->state == BT_CONNECTED && (sco->state == BT_OPEN || sco->state == BT_CLOSED)) { - if (lmp_esco_capable(hdev)) + if (type==ESCO_LINK) hci_setup_sync(sco, acl->handle); else hci_add_sco(sco, acl->handle); --- net/bluetooth/sco.c.orig 2008-01-28 09:15:14.000000000 +0100 +++ net/bluetooth/sco.c 2008-01-28 09:21:00.000000000 +0100 @@ -189,7 +189,7 @@ struct sco_conn *conn; struct hci_conn *hcon; struct hci_dev *hdev; - int err, type; + int err; BT_DBG("%s -> %s", batostr(src), batostr(dst)); @@ -200,9 +200,7 @@ err = -ENOMEM; - type = lmp_esco_capable(hdev) ? ESCO_LINK : SCO_LINK; - - hcon = hci_connect(hdev, type, dst); + hcon = hci_connect(hdev, SCO_LINK, dst); if (!hcon) goto done; --=-9XD85jEIyvacT13OzL2D Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ --=-9XD85jEIyvacT13OzL2D Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Bluez-devel mailing list Bluez-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bluez-devel --=-9XD85jEIyvacT13OzL2D--