Commit e2139b32 authored Mar 26, 2009 by Johan Hedberg Committed by Marcel Holtmann Apr 19, 2009

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>

parent a0a69a01

net/bluetooth/rfcomm/core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);