diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-20 02:16:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-20 02:16:44 -0700 |
| commit | 9a5120ddd18ff93c304c9ead0b5c4278d9b417e2 (patch) | |
| tree | f0825468d0496c4b6d7ce39c1d948f3685ca978c /net/bluetooth/rfcomm/core.c | |
| parent | eb39c57ff7782bc015da517af1d9c3b2592e721e (diff) | |
| parent | 9499237a1c42a27fbcc7ed1d59e34df2b574cdfb (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/rfcomm/core.c')
| -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); |