diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-19 08:37:53 -0500 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-19 08:37:53 -0500 |
| commit | 4b0b2f088f12e2ada1297502d7bebde182cf65b0 (patch) | |
| tree | c3f5bdb06a047eaca8a2e09b6dfd285d0cc26037 /net/bluetooth/rfcomm | |
| parent | 4dad99928211a20a91ec4515ab3b53fd65988f34 (diff) | |
| parent | d7660918fce210f421cc58c060ca3de71e4ffd37 (diff) | |
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) | |||
| 1162 | if (list_empty(&s->dlcs)) { | 1162 | if (list_empty(&s->dlcs)) { |
| 1163 | s->state = BT_DISCONN; | 1163 | s->state = BT_DISCONN; |
| 1164 | rfcomm_send_disc(s, 0); | 1164 | rfcomm_send_disc(s, 0); |
| 1165 | rfcomm_session_clear_timer(s); | ||
| 1165 | } | 1166 | } |
| 1166 | 1167 | ||
| 1167 | break; | 1168 | break; |