Bluetooth: Set discon_timeout to 0 in l2cap_conn_del
authorJohan Hedberg <johan.hedberg@intel.com>
Mon, 18 Aug 2014 17:33:28 +0000 (20:33 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Mon, 8 Sep 2014 17:07:54 +0000 (19:07 +0200)
When the l2cap_conn_del() function is used we do not want to wait around
"in case something happens" before disconnecting. This patch sets the
disconnection timeout to 0 so that the disconnection routines get
immediately scheduled.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/l2cap_core.c

index cb36169ef300fed5fff434976581f107156ee807..2d550afe4322695fccb8314f0e253641b129c5b2 100644 (file)
@@ -1640,6 +1640,9 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
 
        l2cap_unregister_all_users(conn);
 
+       /* Force the connection to be immediately dropped */
+       hcon->disc_timeout = 0;
+
        mutex_lock(&conn->chan_lock);
 
        /* Kill channels */