diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2009-03-26 16:41:56 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-04-19 18:56:45 +0200 |
| commit | e2139b32726e5dd184974c785ea3f62026590801 (patch) | |
| tree | 663f35194914f7aa2dbb30fb65ed3f4b13ed8da9 /net/bluetooth | |
| parent | a0a69a0106dab8d20596f97f6674bed3b394d1ee (diff) | |
| download | kernel-crypto-e2139b32726e5dd184974c785ea3f62026590801.tar.gz kernel-crypto-e2139b32726e5dd184974c785ea3f62026590801.tar.xz kernel-crypto-e2139b32726e5dd184974c785ea3f62026590801.zip | |
Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP
There is a missing call to rfcomm_dlc_clear_timer in the case that
DEFER_SETUP is used and so the connection gets disconnected after the
timeout even if it was successfully accepted previously.
This patch adds a call to rfcomm_dlc_clear_timer to rfcomm_dlc_accept
which will get called when the user accepts the connection by calling
read() on the socket.
Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 1d0fb0f23c6..374536e050a 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -1194,6 +1194,8 @@ void rfcomm_dlc_accept(struct rfcomm_dlc *d) rfcomm_send_ua(d->session, d->dlci); + rfcomm_dlc_clear_timer(d); + rfcomm_dlc_lock(d); d->state = BT_CONNECTED; d->state_change(d, 0); |