diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-10-21 16:22:26 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2013-10-21 16:50:56 -0400 |
commit | d78a32a8fcf775111ccc9ba611a08ca5c29784b6 (patch) | |
tree | 039a7bfd8ad840946390f9940381c3ebfa5cfba5 /net/bluetooth/l2cap_sock.c | |
parent | 7f5396a774997a24e2adaffd973cfa5bd2b3e665 (diff) |
Bluetooth: Remove sk member from struct l2cap_chan
There is no access to chan->sk in L2CAP core now. This change marks the
end of the task of splitting L2CAP between Core and Socket, thus sk is now
gone from struct l2cap_chan.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
-rw-r--r-- | net/bluetooth/l2cap_sock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index cba3162dc33d..7cc24d263caa 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c | |||
@@ -1374,8 +1374,6 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, | |||
1374 | 1374 | ||
1375 | l2cap_chan_hold(chan); | 1375 | l2cap_chan_hold(chan); |
1376 | 1376 | ||
1377 | chan->sk = sk; | ||
1378 | |||
1379 | l2cap_pi(sk)->chan = chan; | 1377 | l2cap_pi(sk)->chan = chan; |
1380 | 1378 | ||
1381 | return sk; | 1379 | return sk; |