summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2010-02-24 09:29:10 -0800
committerNick Pelly <npelly@google.com>2010-02-24 11:11:34 -0800
commit33a3a31ffafc73c537e4a99c99da766863cc9d41 (patch)
treefb2f86019d0dcfd70fd47fb91c2d27eb293ef980 /net
parenta8d5021410094d76f4b6003b67ec5ab1d33a6ec6 (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>
Diffstat (limited to 'net')
-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 e105d36f01a7..77d76e6d999f 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -1194,8 +1194,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);