Commit 5d41ce1d authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: Refactor L2CAP channel allocation 



If the allocation happens at l2cap_sock_create() will be able to use the
struct l2cap_chan to store channel info that comes from the user via
setsockopt.

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

include/net/bluetooth/l2cap.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -465,7 +465,8 @@ void l2cap_sock_init(struct sock *sk, struct sock *parent); 
struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,

struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,

							int proto, gfp_t prio);

							int proto, gfp_t prio);

void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *chan, int err);

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);

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

int l2cap_do_connect(struct sock *sk);

int l2cap_do_connect(struct l2cap_chan *chan);





#endif /* __L2CAP_H */
 
#endif /* __L2CAP_H */

net/bluetooth/l2cap_core.c

+7 −16
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ static u16 l2cap_alloc_cid(struct l2cap_conn *conn) 
	return 0;

	return 0;

}

}





static struct l2cap_chan *l2cap_chan_alloc(struct sock *sk)

struct l2cap_chan *l2cap_chan_alloc(struct sock *sk)

{

{

	struct l2cap_chan *chan;

	struct l2cap_chan *chan;
@@ -648,6 +648,8 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) 
		goto clean;

		goto clean;

	}

	}





	l2cap_pi(sk)->chan = chan;



	write_lock_bh(&conn->chan_lock);

	write_lock_bh(&conn->chan_lock);





	hci_conn_hold(conn->hcon);

	hci_conn_hold(conn->hcon);
@@ -661,8 +663,6 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) 




	__l2cap_chan_add(conn, chan);

	__l2cap_chan_add(conn, chan);





	l2cap_pi(sk)->chan = chan;



	l2cap_sock_set_timer(sk, sk->sk_sndtimeo);

	l2cap_sock_set_timer(sk, sk->sk_sndtimeo);





	sk->sk_state = BT_CONNECTED;

	sk->sk_state = BT_CONNECTED;
@@ -847,12 +847,12 @@ static struct sock *l2cap_get_sock_by_psm(int state, __le16 psm, bdaddr_t *src) 
	return node ? sk : sk1;

	return node ? sk : sk1;

}

}





int l2cap_do_connect(struct sock *sk)

int l2cap_do_connect(struct l2cap_chan *chan)

{

{

	struct sock *sk = chan->sk;

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

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

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

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

	struct l2cap_conn *conn;

	struct l2cap_conn *conn;

	struct l2cap_chan *chan;

	struct hci_conn *hcon;

	struct hci_conn *hcon;

	struct hci_dev *hdev;

	struct hci_dev *hdev;

	__u8 auth_type;

	__u8 auth_type;
@@ -888,20 +888,11 @@ int l2cap_do_connect(struct sock *sk) 
		goto done;

		goto done;

	}

	}





	chan = l2cap_chan_alloc(sk);

	if (!chan) {

		hci_conn_put(hcon);

		err = -ENOMEM;

		goto done;

	}



	/* Update source addr of the socket */

	/* Update source addr of the socket */

	bacpy(src, conn->src);

	bacpy(src, conn->src);





	l2cap_chan_add(conn, chan);

	l2cap_chan_add(conn, chan);





	l2cap_pi(sk)->chan = chan;



	sk->sk_state = BT_CONNECT;

	sk->sk_state = BT_CONNECT;

	l2cap_sock_set_timer(sk, sk->sk_sndtimeo);

	l2cap_sock_set_timer(sk, sk->sk_sndtimeo);
@@ -2076,6 +2067,8 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd 
		goto response;

		goto response;

	}

	}





	l2cap_pi(sk)->chan = chan;



	write_lock_bh(&conn->chan_lock);

	write_lock_bh(&conn->chan_lock);





	/* Check if we already have channel with that dcid */

	/* Check if we already have channel with that dcid */
@@ -2098,8 +2091,6 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd 




	__l2cap_chan_add(conn, chan);

	__l2cap_chan_add(conn, chan);





	l2cap_pi(sk)->chan = chan;



	dcid = l2cap_pi(sk)->scid;

	dcid = l2cap_pi(sk)->scid;





	l2cap_sock_set_timer(sk, sk->sk_sndtimeo);

	l2cap_sock_set_timer(sk, sk->sk_sndtimeo);

net/bluetooth/l2cap_sock.c

+10 −1
Original line number Original line 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)->psm = la.l2_psm;

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

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





	err = l2cap_do_connect(sk);

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

	if (err)

	if (err)

		goto done;

		goto done;
@@ -1054,6 +1054,7 @@ static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol, 
			     int kern)

			     int kern)

{

{

	struct sock *sk;

	struct sock *sk;

	struct l2cap_chan *chan;





	BT_DBG("sock %p", sock);

	BT_DBG("sock %p", sock);
@@ -1072,6 +1073,14 @@ static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol, 
	if (!sk)

	if (!sk)

		return -ENOMEM;

		return -ENOMEM;





	chan = l2cap_chan_alloc(sk);

	if (!chan) {

		l2cap_sock_kill(sk);

		return -ENOMEM;

	}



	l2cap_pi(sk)->chan = chan;



	l2cap_sock_init(sk, NULL);

	l2cap_sock_init(sk, NULL);

	return 0;

	return 0;

}

}