summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2010-02-24 09:29:10 -0800
committerColin Cross <ccross@android.com>2010-09-29 17:49:29 -0700
commitb297a5aab0ebfe39ab08d6b28cf73dd35adecca3 (patch)
tree91522bc3d091f6d66097dbb275b62fff971f279d
parente8e99256295388e6d0693c560b83985f7cc7d96c (diff)
Revert "Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP"
This reverts commit e2139b32726e5dd184974c785ea3f62026590801. Change-Id: Id948d5860840aaf85eca7d8894a7bb3192f0bb47 Signed-off-by: Nick Pelly <npelly@google.com>
-rw-r--r--net/bluetooth/rfcomm/core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index dac41ad6fc3d..b29d4ca178ff 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -1203,8 +1203,6 @@ 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);