1 files changed, 6 insertions, 9 deletions

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 1884f72083c2..ed06f88e6f10 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -99,15 +99,6 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
         if (!bdaddr_type_is_valid(la.l2_bdaddr_type))
                 return -EINVAL;
 
-        if (la.l2_cid) {
-                /* When the socket gets created it defaults to
-                 * CHAN_CONN_ORIENTED, so we need to overwrite the
-                 * default here.
-                 */
-                chan->chan_type = L2CAP_CHAN_FIXED;
-                chan->omtu = L2CAP_DEFAULT_MTU;
-        }
-
         if (bdaddr_type_is_le(la.l2_bdaddr_type)) {
                 /* We only allow ATT user space socket */
                 if (la.l2_cid &&
@@ -790,6 +781,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
                 if (chan->scid == L2CAP_CID_ATT) {
                         if (smp_conn_security(conn->hcon, sec.level))
                                 break;
+                        set_bit(FLAG_PENDING_SECURITY, &chan->flags);
                         sk->sk_state = BT_CONFIG;
                         chan->state = BT_CONFIG;
 
@@ -1359,6 +1351,11 @@ static void l2cap_sock_resume_cb(struct l2cap_chan *chan)
 {
         struct sock *sk = chan->data;
 
+        if (test_and_clear_bit(FLAG_PENDING_SECURITY, &chan->flags)) {
+                sk->sk_state = BT_CONNECTED;
+                chan->state = BT_CONNECTED;
+        }
+
         clear_bit(BT_SK_SUSPEND, &bt_sk(sk)->flags);
         sk->sk_state_change(sk);
 }