]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Bluetooth: Use the same timeouts for both ACL and LE links
authorVinicius Costa Gomes <vinicius.gomes@openbossa.org>
Sat, 20 Aug 2011 00:06:52 +0000 (21:06 -0300)
committerGustavo F. Padovan <padovan@profusion.mobi>
Wed, 21 Sep 2011 15:58:11 +0000 (12:58 -0300)
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
include/net/bluetooth/hci_core.h

index 605829b2c63e6caebf360555dbac88c4f18a8a8f..88566f2e0a6fa7c77616bac29676595d7a420e94 100644 (file)
@@ -492,7 +492,7 @@ static inline void hci_conn_put(struct hci_conn *conn)
 {
        if (atomic_dec_and_test(&conn->refcnt)) {
                unsigned long timeo;
-               if (conn->type == ACL_LINK) {
+               if (conn->type == ACL_LINK || conn->type == LE_LINK) {
                        del_timer(&conn->idle_timer);
                        if (conn->state == BT_CONNECTED) {
                                timeo = msecs_to_jiffies(conn->disc_timeout);