aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap_core.c3
-rw-r--r--net/bluetooth/l2cap_sock.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index fc15174c612c..52e1871d6334 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -424,6 +424,9 @@ struct l2cap_chan *l2cap_chan_create(void)
424 424
425 mutex_init(&chan->lock); 425 mutex_init(&chan->lock);
426 426
427 /* Set default lock nesting level */
428 atomic_set(&chan->nesting, L2CAP_NESTING_NORMAL);
429
427 write_lock(&chan_list_lock); 430 write_lock(&chan_list_lock);
428 list_add(&chan->global_l, &chan_list); 431 list_add(&chan->global_l, &chan_list);
429 write_unlock(&chan_list_lock); 432 write_unlock(&chan_list_lock);
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 7913c28c643d..a5aa9f92b5e2 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -1510,9 +1510,6 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
1510 l2cap_chan_set_defaults(chan); 1510 l2cap_chan_set_defaults(chan);
1511 } 1511 }
1512 1512
1513 /* Set default lock nesting level */
1514 atomic_set(&chan->nesting, L2CAP_NESTING_NORMAL);
1515
1516 /* Default config options */ 1513 /* Default config options */
1517 chan->flush_to = L2CAP_DEFAULT_FLUSH_TO; 1514 chan->flush_to = L2CAP_DEFAULT_FLUSH_TO;
1518 1515