Commit b3ff670a authored Aug 18, 2014 by Johan Hedberg Committed by Marcel Holtmann Sep 08, 2014

Bluetooth: Set disc_timeout to 0 when calling hci_chan_del



The hci_chan_del() function is used in scenarios where we've decided we
want to get rid of the underlying baseband link. It makes therefore
sense to force the disc_timeout to 0 so that the disconnection routines
are immediately scheduled.

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

parent 6c388d32

net/bluetooth/hci_conn.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1316,6 +1316,9 @@ void hci_chan_del(struct hci_chan *chan)

		synchronize_rcu();

		/* Force the connection to be immediately dropped */
		conn->disc_timeout = 0;

		hci_conn_drop(conn);
		hci_conn_put(conn);