|
@@ -659,10 +659,10 @@ static struct rfcomm_session *rfcomm_session_close(struct rfcomm_session *s,
|
|
|
struct rfcomm_dlc *d;
|
|
|
struct list_head *p, *n;
|
|
|
|
|
|
- BT_DBG("session %p state %ld err %d", s, s->state, err);
|
|
|
-
|
|
|
s->state = BT_CLOSED;
|
|
|
|
|
|
+ BT_DBG("session %p state %ld err %d", s, s->state, err);
|
|
|
+
|
|
|
/* Close all dlcs */
|
|
|
list_for_each_safe(p, n, &s->dlcs) {
|
|
|
d = list_entry(p, struct rfcomm_dlc, list);
|
|
@@ -1188,7 +1188,6 @@ static struct rfcomm_session *rfcomm_recv_dm(struct rfcomm_session *s, u8 dlci)
|
|
|
else
|
|
|
err = ECONNRESET;
|
|
|
|
|
|
- s->state = BT_CLOSED;
|
|
|
s = rfcomm_session_close(s, err);
|
|
|
}
|
|
|
return s;
|
|
@@ -1224,7 +1223,6 @@ static struct rfcomm_session *rfcomm_recv_disc(struct rfcomm_session *s,
|
|
|
else
|
|
|
err = ECONNRESET;
|
|
|
|
|
|
- s->state = BT_CLOSED;
|
|
|
s = rfcomm_session_close(s, err);
|
|
|
}
|
|
|
return s;
|
|
@@ -1921,7 +1919,6 @@ static struct rfcomm_session *rfcomm_check_connection(struct rfcomm_session *s)
|
|
|
break;
|
|
|
|
|
|
case BT_CLOSED:
|
|
|
- s->state = BT_CLOSED;
|
|
|
s = rfcomm_session_close(s, sk->sk_err);
|
|
|
break;
|
|
|
}
|