[PATCH 2/6] Revert "UBUNTU: SAUCE: Always use SCO protocol (disable eSCO support)"

[Andres Salomon]

This reverts commit 64cf2f7d98b02772c0df05e3614cd5cde34bcac5.

This "fix" is incorrect; the proper fix is http://lkml.org/lkml/2008/2/27/105,
and is already upstream.

Signed-off-by: Andres Salomon <dilinger at canonical.com>
---
 net/bluetooth/sco.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 153e7f6..93ad1aa 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -200,11 +200,7 @@ static int sco_connect(struct sock *sk)
 
 	err = -ENOMEM;
 
-	/*
-	 * Since eSCO seems currently broken, always use SCO (LP#39414).
-	 * type = lmp_esco_capable(hdev) ? ESCO_LINK : SCO_LINK;
-	 */
-	type = SCO_LINK;
+	type = lmp_esco_capable(hdev) ? ESCO_LINK : SCO_LINK;
 
 	hcon = hci_connect(hdev, type, dst);
 	if (!hcon)
-- 
1.5.6.5