commit eef1d9b668c51dcae58d8bb41ce0c805f866dbbd
author Gustavo Padovan <gustavo@padovan.org> Sun Mar 25 13:59:16 2012 -0300
committer Gustavo Padovan <gustavo@padovan.org> Wed May 09 00:41:36 2012 -0300
tree ca3bdca54bbeeb59a15d8d4dafbda33dbb000101
parent 14a284918416e480bf49f8c05dfeefa02640d2d6

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>

net/bluetooth/l2cap_sock.c

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 29122ed..53e563f 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -1048,12 +1048,14 @@
 	sk->sk_protocol = proto;
 	sk->sk_state = BT_OPEN;
 
-	chan = l2cap_chan_create(sk);
+	chan = l2cap_chan_create();
 	if (!chan) {
 		l2cap_sock_kill(sk);
 		return NULL;
 	}
 
+	chan->sk = sk;
+
 	l2cap_pi(sk)->chan = chan;
 
 	return sk;