Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d78a32a8 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

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: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 7f5396a7

include/net/bluetooth/l2cap.h

+0 −2
Original line number Diff line number Diff line
@@ -435,8 +435,6 @@ struct l2cap_seq_list { 
#define L2CAP_SEQ_LIST_TAIL	0x8000



struct l2cap_chan {

	struct sock *sk;



	struct l2cap_conn	*conn;

	struct hci_conn		*hs_hcon;

	struct hci_chan		*hs_hchan;

net/bluetooth/l2cap_sock.c

+0 −2
Original line number Diff line number Diff line
@@ -1374,8 +1374,6 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, 


	l2cap_chan_hold(chan);



	chan->sk = sk;



	l2cap_pi(sk)->chan = chan;



	return sk;