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

Commit eef1d9b6 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

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: default avatarGustavo Padovan <gustavo@padovan.org>
parent 14a28491

include/net/bluetooth/l2cap.h

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ int __l2cap_wait_ack(struct sock *sk); 
int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm);

int l2cap_add_scid(struct l2cap_chan *chan,  __u16 scid);



struct l2cap_chan *l2cap_chan_create(struct sock *sk);

struct l2cap_chan *l2cap_chan_create(void);

void l2cap_chan_close(struct l2cap_chan *chan, int reason);

void l2cap_chan_destroy(struct l2cap_chan *chan);

int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,

net/bluetooth/l2cap_core.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

}

net/bluetooth/l2cap_sock.c

+3 −1
Original line number Diff line number Diff line
@@ -1048,12 +1048,14 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, int p 
	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;