[bluetooth] Revert commit that breaks BlueZ SCO handling.

Revert "Bluetooth: Block SCO disconnect operation on BT_CLOSED state." This reverts commit c5a53b5. Signed-off-by: Hannu Mallat <hannu.mallat@jollamobile.com>
RealJohnGalt · Apr 27, 2016 · 0b3ae7f · 0b3ae7f
1 parent 2f66ef3
commit 0b3ae7f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h
@@ -31,7 +31,7 @@
 #define SCO_DEFAULT_FLUSH_TO	0xFFFF
 
 #define SCO_CONN_TIMEOUT	(HZ * 40)
-#define SCO_DISCONN_TIMEOUT	(HZ * 20)
+#define SCO_DISCONN_TIMEOUT	(HZ * 2)
 #define SCO_CONN_IDLE_TIMEOUT	(HZ * 60)
 
 /* SCO socket address */

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
@@ -814,9 +814,6 @@ static int sco_sock_shutdown(struct socket *sock, int how)
 		if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)
 			err = bt_sock_wait_state(sk, BT_CLOSED,
 							sk->sk_lingertime);
-		else
-			err = bt_sock_wait_state(sk, BT_CLOSED,
-							SCO_DISCONN_TIMEOUT);
 	}
 	release_sock(sk);
 	return err;
@@ -838,11 +835,6 @@ static int sco_sock_release(struct socket *sock)
 		lock_sock(sk);
 		err = bt_sock_wait_state(sk, BT_CLOSED, sk->sk_lingertime);
 		release_sock(sk);
-	} else {
-		lock_sock(sk);
-		err = bt_sock_wait_state(sk, BT_CLOSED,
-							SCO_DISCONN_TIMEOUT);
-		release_sock(sk);
 	}
 
 	sock_orphan(sk);