diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-08-18 00:41:43 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-09-08 19:07:53 +0200 |
| commit | b3ff670a44cc34c01e78900c42255511e4f232e6 (patch) | |
| tree | 2d03c53e48695d191ac9a3730bcef1003e81c5da | |
| parent | 6c388d32ec1b9fcc2f2404fb5e9b3b0096be5de9 (diff) | |
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>
| -rw-r--r-- | net/bluetooth/hci_conn.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 7815826a48e4..cb04a4e3c829 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -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); |