diff options
| author | Gustavo F. Padovan | 2011-12-19 14:37:53 +0100 |
|---|---|---|
| committer | Gustavo F. Padovan | 2011-12-19 14:37:53 +0100 |
| commit | 4b0b2f088f12e2ada1297502d7bebde182cf65b0 (patch) | |
| tree | c3f5bdb06a047eaca8a2e09b6dfd285d0cc26037 /net/bluetooth/rfcomm | |
| parent | Bluetooth: Add missing mgmt_confirm_name command definition (diff) | |
| parent | Revert "Bluetooth: Revert: Fix L2CAP connection establishment" (diff) | |
| download | kernel-qcow2-linux-4b0b2f088f12e2ada1297502d7bebde182cf65b0.tar.gz kernel-qcow2-linux-4b0b2f088f12e2ada1297502d7bebde182cf65b0.tar.xz kernel-qcow2-linux-4b0b2f088f12e2ada1297502d7bebde182cf65b0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'net/bluetooth/rfcomm')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 8743f369ed3f..be6288cf854a 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -1162,6 +1162,7 @@ static int rfcomm_recv_ua(struct rfcomm_session *s, u8 dlci) if (list_empty(&s->dlcs)) { s->state = BT_DISCONN; rfcomm_send_disc(s, 0); + rfcomm_session_clear_timer(s); } break; |