diff options
| author | Andre Guedes <andre.guedes@openbossa.org> | 2013-01-30 11:50:55 -0300 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-01-31 15:38:02 -0200 |
| commit | 4c02e2d444595200d0b18b889994aac3611cd288 (patch) | |
| tree | 3987a936a05bd8223f169117953b4bb44e4b920d /net | |
| parent | 8cf9fa1240229cbdd888236c0c43fcbad680cf00 (diff) | |
| download | linux-3.10-4c02e2d444595200d0b18b889994aac3611cd288.tar.gz linux-3.10-4c02e2d444595200d0b18b889994aac3611cd288.tar.bz2 linux-3.10-4c02e2d444595200d0b18b889994aac3611cd288.zip | |
Bluetooth: Fix hci_conn timeout routine
If occurs a LE or SCO hci_conn timeout and the connection is already
established (BT_CONNECTED state), the connection is not terminated as
expected. This bug can be reproduced using l2test or scotest tool.
Once the connection is established, kill l2test/scotest and the
connection won't be terminated.
This patch fixes hci_conn_disconnect helper so it is able to
terminate LE and SCO connections, as well as ACL.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 25bfce0666e..4925a02ae7e 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -249,12 +249,12 @@ static void hci_conn_disconnect(struct hci_conn *conn) __u8 reason = hci_proto_disconn_ind(conn); switch (conn->type) { - case ACL_LINK: - hci_acl_disconn(conn, reason); - break; case AMP_LINK: hci_amp_disconn(conn, reason); break; + default: + hci_acl_disconn(conn, reason); + break; } } |