From 14df2e4bc8faf7cd07a23fffa3e5d193aa70b7cf Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 14 Jul 2008 20:13:53 +0200 Subject: [PATCH] --- yaml --- r: 103679 b: refs/heads/master c: 7cb127d5b0e7af7a0afd23785722ca3edab4ceff h: refs/heads/master i: 103677: a2cb94af1ddd818e3785a7d51e1c97900ce4aee8 103675: 0a077c724511dbaf0a8b7fec54109808515f9fd4 103671: d5f3bbbc55aa04d2290ad0cf7e1d17772c86214d 103663: ab0bb8a2c6efe61b267440946195b1904f960a02 103647: bde3050fb1710c526c3d1980399aac3b3a794b8b 103615: a45f101542508591449d90d8fea9118f6c7c904c 103551: 70376bb5fe96b40392ba9297195150ff4fe8a94d 103423: 088dc7586fbfbea8d144e0fec084998e251b670f v: v3 --- [refs] | 2 +- trunk/net/bluetooth/sco.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4115122623dd..b14186ff0af4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec8dab36e0738d3059980d144e34f16a26bbda7d +refs/heads/master: 7cb127d5b0e7af7a0afd23785722ca3edab4ceff diff --git a/trunk/net/bluetooth/sco.c b/trunk/net/bluetooth/sco.c index 1ad226c9788c..8cda49874868 100644 --- a/trunk/net/bluetooth/sco.c +++ b/trunk/net/bluetooth/sco.c @@ -53,7 +53,9 @@ #define BT_DBG(D...) #endif -#define VERSION "0.5" +#define VERSION "0.6" + +static int disable_esco = 0; static const struct proto_ops sco_sock_ops; @@ -193,7 +195,10 @@ static int sco_connect(struct sock *sk) err = -ENOMEM; - type = lmp_esco_capable(hdev) ? ESCO_LINK : SCO_LINK; + if (lmp_esco_capable(hdev) && !disable_esco) + type = ESCO_LINK; + else + type = SCO_LINK; hcon = hci_connect(hdev, type, dst); if (!hcon) @@ -994,6 +999,9 @@ static void __exit sco_exit(void) module_init(sco_init); module_exit(sco_exit); +module_param(disable_esco, bool, 0644); +MODULE_PARM_DESC(disable_esco, "Disable eSCO connection creation"); + MODULE_AUTHOR("Maxim Krasnyansky , Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth SCO ver " VERSION); MODULE_VERSION(VERSION);