diff options
| author | Nick Pelly <npelly@google.com> | 2010-02-24 09:29:45 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-09-29 17:49:29 -0700 |
| commit | 702c14e404bbee74faea2fd6f6d3120cba1b8b3f (patch) | |
| tree | 486d360cd0e1f02ed51246076d7b1e674ea5402b /net/bluetooth | |
| parent | b297a5aab0ebfe39ab08d6b28cf73dd35adecca3 (diff) | |
Revert "Bluetooth: Change RFCOMM to use BT_CONNECT2 for BT_DEFER_SETUP"
This reverts commit 8bf4794174659b06d43cc5e290cd384757374613.
Change-Id: Ieaeed6866996446e0392e387b77b446361f23d46
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index b29d4ca178ff..ecda6d52d4d4 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -451,7 +451,6 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err) break; case BT_OPEN: - case BT_CONNECT2: if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) { set_bit(RFCOMM_AUTH_REJECT, &d->flags); rfcomm_schedule(RFCOMM_SCHED_AUTH); @@ -1220,11 +1219,6 @@ static void rfcomm_check_accept(struct rfcomm_dlc *d) if (d->defer_setup) { set_bit(RFCOMM_DEFER_SETUP, &d->flags); rfcomm_dlc_set_timer(d, RFCOMM_AUTH_TIMEOUT); - - rfcomm_dlc_lock(d); - d->state = BT_CONNECT2; - d->state_change(d, 0); - rfcomm_dlc_unlock(d); } else rfcomm_dlc_accept(d); } else { @@ -1766,11 +1760,6 @@ static inline void rfcomm_process_dlcs(struct rfcomm_session *s) if (d->defer_setup) { set_bit(RFCOMM_DEFER_SETUP, &d->flags); rfcomm_dlc_set_timer(d, RFCOMM_AUTH_TIMEOUT); - - rfcomm_dlc_lock(d); - d->state = BT_CONNECT2; - d->state_change(d, 0); - rfcomm_dlc_unlock(d); } else rfcomm_dlc_accept(d); } |