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

Commit 77a74c7e authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: Rename l2cap_do_connect() to l2cap_chan_connect() 



l2cap_chan_connect() is a much better name and reflects what this
functions is doing (or will do once socket dependence is removed from the
core).

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent b4450035

include/net/bluetooth/l2cap.h

+1 −1
Original line number Diff line number Diff line
@@ -466,6 +466,6 @@ struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, 
void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *chan, int err);

struct l2cap_chan *l2cap_chan_alloc(struct sock *sk);

void l2cap_chan_del(struct l2cap_chan *chan, int err);

int l2cap_do_connect(struct l2cap_chan *chan);

int l2cap_chan_connect(struct l2cap_chan *chan);



#endif /* __L2CAP_H */

net/bluetooth/l2cap_core.c

+1 −1
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static struct sock *l2cap_get_sock_by_psm(int state, __le16 psm, bdaddr_t *src) 
	return node ? sk : sk1;

}



int l2cap_do_connect(struct l2cap_chan *chan)

int l2cap_chan_connect(struct l2cap_chan *chan)

{

	struct sock *sk = chan->sk;

	bdaddr_t *src = &bt_sk(sk)->src;

net/bluetooth/l2cap_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al 
	l2cap_pi(sk)->psm = la.l2_psm;

	l2cap_pi(sk)->dcid = la.l2_cid;



	err = l2cap_do_connect(l2cap_pi(sk)->chan);

	err = l2cap_chan_connect(l2cap_pi(sk)->chan);

	if (err)

		goto done;