Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 103679
b: refs/heads/master
c: 7cb127d
h: refs/heads/master
i:
  103677: a2cb94a
  103675: 0a077c7
  103671: d5f3bbb
  103663: ab0bb8a
  103647: bde3050
  103615: a45f101
  103551: 70376bb
  103423: 088dc75
v: v3
  • Loading branch information
Marcel Holtmann committed Jul 14, 2008
1 parent 5a5dd37 commit 14df2e4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ec8dab36e0738d3059980d144e34f16a26bbda7d
refs/heads/master: 7cb127d5b0e7af7a0afd23785722ca3edab4ceff
12 changes: 10 additions & 2 deletions trunk/net/bluetooth/sco.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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 <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>");
MODULE_DESCRIPTION("Bluetooth SCO ver " VERSION);
MODULE_VERSION(VERSION);
Expand Down

0 comments on commit 14df2e4

Please sign in to comment.