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

Commit 0139418c authored by Marcel Holtmann's avatar Marcel Holtmann Committed by David S. Miller
Browse files

[Bluetooth] Small cleanup of the L2CAP source code 



This patch is a small cleanup of the L2CAP source code. It makes some
coding style changes and moves some functions around to avoid forward
declarations.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent a91f2e39

net/bluetooth/l2cap.c

+177 −180
Original line number Diff line number Diff line
@@ -63,11 +63,6 @@ static struct bt_sock_list l2cap_sk_list = { 
	.lock = RW_LOCK_UNLOCKED

};



static int l2cap_conn_del(struct hci_conn *conn, int err);



static void __l2cap_chan_add(struct l2cap_conn *conn, struct sock *sk, struct sock *parent);

static void l2cap_chan_del(struct sock *sk, int err);



static void __l2cap_sock_close(struct sock *sk, int reason);

static void l2cap_sock_close(struct sock *sk);

static void l2cap_sock_kill(struct sock *sk);
@@ -109,24 +104,177 @@ static void l2cap_sock_init_timer(struct sock *sk) 
	sk->sk_timer.data = (unsigned long)sk;

}



/* ---- L2CAP channels ---- */

static struct sock *__l2cap_get_chan_by_dcid(struct l2cap_chan_list *l, u16 cid)

{

	struct sock *s;

	for (s = l->head; s; s = l2cap_pi(s)->next_c) {

		if (l2cap_pi(s)->dcid == cid)

			break;

	}

	return s;

}



static struct sock *__l2cap_get_chan_by_scid(struct l2cap_chan_list *l, u16 cid)

{

	struct sock *s;

	for (s = l->head; s; s = l2cap_pi(s)->next_c) {

		if (l2cap_pi(s)->scid == cid)

			break;

	}

	return s;

}



/* Find channel with given SCID.

 * Returns locked socket */

static inline struct sock *l2cap_get_chan_by_scid(struct l2cap_chan_list *l, u16 cid)

{

	struct sock *s;

	read_lock(&l->lock);

	s = __l2cap_get_chan_by_scid(l, cid);

	if (s) bh_lock_sock(s);

	read_unlock(&l->lock);

	return s;

}



static struct sock *__l2cap_get_chan_by_ident(struct l2cap_chan_list *l, u8 ident)

{

	struct sock *s;

	for (s = l->head; s; s = l2cap_pi(s)->next_c) {

		if (l2cap_pi(s)->ident == ident)

			break;

	}

	return s;

}



static inline struct sock *l2cap_get_chan_by_ident(struct l2cap_chan_list *l, u8 ident)

{

	struct sock *s;

	read_lock(&l->lock);

	s = __l2cap_get_chan_by_ident(l, ident);

	if (s) bh_lock_sock(s);

	read_unlock(&l->lock);

	return s;

}



static u16 l2cap_alloc_cid(struct l2cap_chan_list *l)

{

	u16 cid = 0x0040;



	for (; cid < 0xffff; cid++) {

		if(!__l2cap_get_chan_by_scid(l, cid))

			return cid;

	}



	return 0;

}



static inline void __l2cap_chan_link(struct l2cap_chan_list *l, struct sock *sk)

{

	sock_hold(sk);



	if (l->head)

		l2cap_pi(l->head)->prev_c = sk;



	l2cap_pi(sk)->next_c = l->head;

	l2cap_pi(sk)->prev_c = NULL;

	l->head = sk;

}



static inline void l2cap_chan_unlink(struct l2cap_chan_list *l, struct sock *sk)

{

	struct sock *next = l2cap_pi(sk)->next_c, *prev = l2cap_pi(sk)->prev_c;



	write_lock(&l->lock);

	if (sk == l->head)

		l->head = next;



	if (next)

		l2cap_pi(next)->prev_c = prev;

	if (prev)

		l2cap_pi(prev)->next_c = next;

	write_unlock(&l->lock);



	__sock_put(sk);

}



static void __l2cap_chan_add(struct l2cap_conn *conn, struct sock *sk, struct sock *parent)

{

	struct l2cap_chan_list *l = &conn->chan_list;



	BT_DBG("conn %p, psm 0x%2.2x, dcid 0x%4.4x", conn, l2cap_pi(sk)->psm, l2cap_pi(sk)->dcid);



	l2cap_pi(sk)->conn = conn;



	if (sk->sk_type == SOCK_SEQPACKET) {

		/* Alloc CID for connection-oriented socket */

		l2cap_pi(sk)->scid = l2cap_alloc_cid(l);

	} else if (sk->sk_type == SOCK_DGRAM) {

		/* Connectionless socket */

		l2cap_pi(sk)->scid = 0x0002;

		l2cap_pi(sk)->dcid = 0x0002;

		l2cap_pi(sk)->omtu = L2CAP_DEFAULT_MTU;

	} else {

		/* Raw socket can send/recv signalling messages only */

		l2cap_pi(sk)->scid = 0x0001;

		l2cap_pi(sk)->dcid = 0x0001;

		l2cap_pi(sk)->omtu = L2CAP_DEFAULT_MTU;

	}



	__l2cap_chan_link(l, sk);



	if (parent)

		bt_accept_enqueue(parent, sk);

}



/* Delete channel. 

 * Must be called on the locked socket. */

static void l2cap_chan_del(struct sock *sk, int err)

{

	struct l2cap_conn *conn = l2cap_pi(sk)->conn;

	struct sock *parent = bt_sk(sk)->parent;



	l2cap_sock_clear_timer(sk);



	BT_DBG("sk %p, conn %p, err %d", sk, conn, err);



	if (conn) { 

		/* Unlink from channel list */

		l2cap_chan_unlink(&conn->chan_list, sk);

		l2cap_pi(sk)->conn = NULL;

		hci_conn_put(conn->hcon);

	}



	sk->sk_state  = BT_CLOSED;

	sock_set_flag(sk, SOCK_ZAPPED);



	if (err)

		sk->sk_err = err;



	if (parent) {

		bt_accept_unlink(sk);

		parent->sk_data_ready(parent, 0);

	} else

		sk->sk_state_change(sk);

}



/* ---- L2CAP connections ---- */

static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status)

{

	struct l2cap_conn *conn;



	if ((conn = hcon->l2cap_data))

		return conn;

	struct l2cap_conn *conn = hcon->l2cap_data;



	if (status)

	if (conn || status)

		return conn;



	if (!(conn = kmalloc(sizeof(struct l2cap_conn), GFP_ATOMIC)))

	conn = kzalloc(sizeof(struct l2cap_conn), GFP_ATOMIC);

	if (!conn)

		return NULL;

	memset(conn, 0, sizeof(struct l2cap_conn));



	hcon->l2cap_data = conn;

	conn->hcon = hcon;



	BT_DBG("hcon %p conn %p", hcon, conn);



	conn->mtu = hcon->hdev->acl_mtu;

	conn->src = &hcon->hdev->bdaddr;

	conn->dst = &hcon->dst;
@@ -134,17 +282,16 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status) 
	spin_lock_init(&conn->lock);

	rwlock_init(&conn->chan_list.lock);



	BT_DBG("hcon %p conn %p", hcon, conn);

	return conn;

}



static int l2cap_conn_del(struct hci_conn *hcon, int err)

static void l2cap_conn_del(struct hci_conn *hcon, int err)

{

	struct l2cap_conn *conn;

	struct l2cap_conn *conn = hcon->l2cap_data;

	struct sock *sk;



	if (!(conn = hcon->l2cap_data)) 

		return 0;

	if (!conn)

		return;



	BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);
@@ -161,7 +308,6 @@ static int l2cap_conn_del(struct hci_conn *hcon, int err) 


	hcon->l2cap_data = NULL;

	kfree(conn);

	return 0;

}



static inline void l2cap_chan_add(struct l2cap_conn *conn, struct sock *sk, struct sock *parent)
@@ -925,160 +1071,6 @@ static int l2cap_sock_release(struct socket *sock) 
	return err;

}



/* ---- L2CAP channels ---- */

static struct sock *__l2cap_get_chan_by_dcid(struct l2cap_chan_list *l, u16 cid)

{

	struct sock *s;

	for (s = l->head; s; s = l2cap_pi(s)->next_c) {

		if (l2cap_pi(s)->dcid == cid)

			break;

	}

	return s;

}



static struct sock *__l2cap_get_chan_by_scid(struct l2cap_chan_list *l, u16 cid)

{

	struct sock *s;

	for (s = l->head; s; s = l2cap_pi(s)->next_c) {

		if (l2cap_pi(s)->scid == cid)

			break;

	}

	return s;

}



/* Find channel with given SCID.

 * Returns locked socket */

static inline struct sock *l2cap_get_chan_by_scid(struct l2cap_chan_list *l, u16 cid)

{

	struct sock *s;

	read_lock(&l->lock);

	s = __l2cap_get_chan_by_scid(l, cid);

	if (s) bh_lock_sock(s);

	read_unlock(&l->lock);

	return s;

}



static struct sock *__l2cap_get_chan_by_ident(struct l2cap_chan_list *l, u8 ident)

{

	struct sock *s;

	for (s = l->head; s; s = l2cap_pi(s)->next_c) {

		if (l2cap_pi(s)->ident == ident)

			break;

	}

	return s;

}



static inline struct sock *l2cap_get_chan_by_ident(struct l2cap_chan_list *l, u8 ident)

{

	struct sock *s;

	read_lock(&l->lock);

	s = __l2cap_get_chan_by_ident(l, ident);

	if (s) bh_lock_sock(s);

	read_unlock(&l->lock);

	return s;

}



static u16 l2cap_alloc_cid(struct l2cap_chan_list *l)

{

	u16 cid = 0x0040;



	for (; cid < 0xffff; cid++) {

		if(!__l2cap_get_chan_by_scid(l, cid))

			return cid;

	}



	return 0;

}



static inline void __l2cap_chan_link(struct l2cap_chan_list *l, struct sock *sk)

{

	sock_hold(sk);



	if (l->head)

		l2cap_pi(l->head)->prev_c = sk;



	l2cap_pi(sk)->next_c = l->head;

	l2cap_pi(sk)->prev_c = NULL;

	l->head = sk;

}



static inline void l2cap_chan_unlink(struct l2cap_chan_list *l, struct sock *sk)

{

	struct sock *next = l2cap_pi(sk)->next_c, *prev = l2cap_pi(sk)->prev_c;



	write_lock(&l->lock);

	if (sk == l->head)

		l->head = next;



	if (next)

		l2cap_pi(next)->prev_c = prev;

	if (prev)

		l2cap_pi(prev)->next_c = next;

	write_unlock(&l->lock);



	__sock_put(sk);

}



static void __l2cap_chan_add(struct l2cap_conn *conn, struct sock *sk, struct sock *parent)

{

	struct l2cap_chan_list *l = &conn->chan_list;



	BT_DBG("conn %p, psm 0x%2.2x, dcid 0x%4.4x", conn, l2cap_pi(sk)->psm, l2cap_pi(sk)->dcid);



	l2cap_pi(sk)->conn = conn;



	if (sk->sk_type == SOCK_SEQPACKET) {

		/* Alloc CID for connection-oriented socket */

		l2cap_pi(sk)->scid = l2cap_alloc_cid(l);

	} else if (sk->sk_type == SOCK_DGRAM) {

		/* Connectionless socket */

		l2cap_pi(sk)->scid = 0x0002;

		l2cap_pi(sk)->dcid = 0x0002;

		l2cap_pi(sk)->omtu = L2CAP_DEFAULT_MTU;

	} else {

		/* Raw socket can send/recv signalling messages only */

		l2cap_pi(sk)->scid = 0x0001;

		l2cap_pi(sk)->dcid = 0x0001;

		l2cap_pi(sk)->omtu = L2CAP_DEFAULT_MTU;

	}



	__l2cap_chan_link(l, sk);



	if (parent)

		bt_accept_enqueue(parent, sk);

}



/* Delete channel. 

 * Must be called on the locked socket. */

static void l2cap_chan_del(struct sock *sk, int err)

{

	struct l2cap_conn *conn = l2cap_pi(sk)->conn;

	struct sock *parent = bt_sk(sk)->parent;



	l2cap_sock_clear_timer(sk);



	BT_DBG("sk %p, conn %p, err %d", sk, conn, err);



	if (conn) { 

		/* Unlink from channel list */

		l2cap_chan_unlink(&conn->chan_list, sk);

		l2cap_pi(sk)->conn = NULL;

		hci_conn_put(conn->hcon);

	}



	sk->sk_state  = BT_CLOSED;

	sock_set_flag(sk, SOCK_ZAPPED);



	if (err)

		sk->sk_err = err;



	if (parent) {

		bt_accept_unlink(sk);

		parent->sk_data_ready(parent, 0);

	} else

		sk->sk_state_change(sk);

}



static void l2cap_conn_ready(struct l2cap_conn *conn)

{

	struct l2cap_chan_list *l = &conn->chan_list;
@@ -1834,7 +1826,9 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk 
	kfree_skb(skb);



done:

	if (sk) bh_unlock_sock(sk);

	if (sk)

		bh_unlock_sock(sk);



	return 0;

}
@@ -1925,14 +1919,14 @@ static int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type) 


static int l2cap_connect_cfm(struct hci_conn *hcon, u8 status)

{

	struct l2cap_conn *conn;



	BT_DBG("hcon %p bdaddr %s status %d", hcon, batostr(&hcon->dst), status);



	if (hcon->type != ACL_LINK)

		return 0;



	if (!status) {

		struct l2cap_conn *conn;



		conn = l2cap_conn_add(hcon, status);

		if (conn)

			l2cap_conn_ready(conn);
@@ -1950,19 +1944,21 @@ static int l2cap_disconn_ind(struct hci_conn *hcon, u8 reason) 
		return 0;



	l2cap_conn_del(hcon, bt_err(reason));



	return 0;

}



static int l2cap_auth_cfm(struct hci_conn *hcon, u8 status)

{

	struct l2cap_chan_list *l;

	struct l2cap_conn *conn;

	struct l2cap_conn *conn = conn = hcon->l2cap_data;

	struct l2cap_conn_rsp rsp;

	struct sock *sk;

	int result;



	if (!(conn = hcon->l2cap_data))

	if (!conn)

		return 0;



	l = &conn->chan_list;



	BT_DBG("conn %p", conn);
@@ -2005,13 +2001,14 @@ static int l2cap_auth_cfm(struct hci_conn *hcon, u8 status) 
static int l2cap_encrypt_cfm(struct hci_conn *hcon, u8 status)

{

	struct l2cap_chan_list *l;

	struct l2cap_conn *conn;

	struct l2cap_conn *conn = hcon->l2cap_data;

	struct l2cap_conn_rsp rsp;

	struct sock *sk;

	int result;



	if (!(conn = hcon->l2cap_data))

	if (!conn)

		return 0;



	l = &conn->chan_list;



	BT_DBG("conn %p", conn);