aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_core.c
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo@padovan.org>2012-03-25 13:59:16 -0300
committerGustavo Padovan <gustavo@padovan.org>2012-05-09 00:41:36 -0300
commiteef1d9b668c51dcae58d8bb41ce0c805f866dbbd (patch)
treeca3bdca54bbeeb59a15d8d4dafbda33dbb000101 /net/bluetooth/l2cap_core.c
parentBluetooth: Make L2CAP chan_add functions static (diff)
downloadlinux-dev-eef1d9b668c51dcae58d8bb41ce0c805f866dbbd.tar.xz
linux-dev-eef1d9b668c51dcae58d8bb41ce0c805f866dbbd.zip
Bluetooth: Remove sk parameter from l2cap_chan_create()
Following the separation if core and sock code this change avoid manipulation of sk inside l2cap_chan_create(). Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
-rw-r--r--net/bluetooth/l2cap_core.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 8a3de1149352..a57d96afa245 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -262,7 +262,7 @@ static void l2cap_chan_timeout(struct work_struct *work)
l2cap_chan_put(chan);
}
-struct l2cap_chan *l2cap_chan_create(struct sock *sk)
+struct l2cap_chan *l2cap_chan_create(void)
{
struct l2cap_chan *chan;
@@ -272,8 +272,6 @@ struct l2cap_chan *l2cap_chan_create(struct sock *sk)
mutex_init(&chan->lock);
- chan->sk = sk;
-
write_lock(&chan_list_lock);
list_add(&chan->global_l, &chan_list);
write_unlock(&chan_list_lock);
@@ -284,7 +282,7 @@ struct l2cap_chan *l2cap_chan_create(struct sock *sk)
atomic_set(&chan->refcnt, 1);
- BT_DBG("sk %p chan %p", sk, chan);
+ BT_DBG("chan %p", chan);
return chan;
}