lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Add l2cap_add_psm() and l2cap_add_scid()

Browse Source 
The intention is to get rid of the l2cap_sk_list usage inside
l2cap_core.c. l2cap_sk_list will soon be replaced by a list that does not
depend on socket usage.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Gustavo F. Padovan
2011-04-18 18:38:43 -03:00
parent 7cbc9bd995
commit 9e4425fff9
3 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
net/bluetooth/l2cap_core.c
View File

@@ -135,6 +135,50 @@ static inline struct l2cap_chan *l2cap_get_chan_by_ident(struct l2cap_conn *conn
return c;
}
struct sock *__l2cap_get_sock_by_addr(__le16 psm, bdaddr_t *src)
{
struct sock *sk;
struct hlist_node *node;
sk_for_each(sk, node, &l2cap_sk_list.head) {
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
if (chan->sport == psm && !bacmp(&bt_sk(sk)->src, src))
goto found;
}
sk = NULL;
found:
return sk;
}
int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm)
{
write_lock_bh(&l2cap_sk_list.lock);
if (__l2cap_get_sock_by_addr(psm, src)) {
write_unlock_bh(&l2cap_sk_list.lock);
return -EADDRINUSE;
}
chan->psm = psm;
chan->sport = psm;
write_unlock_bh(&l2cap_sk_list.lock);
return 0;
}
int l2cap_add_scid(struct l2cap_chan *chan, __u16 scid)
{
write_lock_bh(&l2cap_sk_list.lock);
chan->scid = scid;
write_unlock_bh(&l2cap_sk_list.lock);
return 0;
}
static u16 l2cap_alloc_cid(struct l2cap_conn *conn)
{
u16 cid = L2CAP_CID_DYN_START;