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

Bluetooth: Remove sk parameter from l2cap_chan_create()

Browse Source 
Following the separation if core and sock code this change avoid
manipulation of sk inside l2cap_chan_create().

Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
This commit is contained in:
Gustavo Padovan
2012-03-25 13:59:16 -03:00
parent 14a2849184
commit eef1d9b668
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/bluetooth/l2cap.h
View File

@@ -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_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm);
int l2cap_add_scid(struct l2cap_chan *chan, __u16 scid); 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_close(struct l2cap_chan *chan, int reason);
void l2cap_chan_destroy(struct l2cap_chan *chan); void l2cap_chan_destroy(struct l2cap_chan *chan);
int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,

6
net/bluetooth/l2cap_core.c
View File

@@ -262,7 +262,7 @@ static void l2cap_chan_timeout(struct work_struct *work)
l2cap_chan_put(chan); l2cap_chan_put(chan);
} }
struct l2cap_chan *l2cap_chan_create(struct sock *sk) struct l2cap_chan *l2cap_chan_create(void)
{ {
struct l2cap_chan *chan; struct l2cap_chan *chan;
@@ -272,8 +272,6 @@ struct l2cap_chan *l2cap_chan_create(struct sock *sk)
mutex_init(&chan->lock); mutex_init(&chan->lock);
chan->sk = sk;
write_lock(&chan_list_lock); write_lock(&chan_list_lock);
list_add(&chan->global_l, &chan_list); list_add(&chan->global_l, &chan_list);
write_unlock(&chan_list_lock); write_unlock(&chan_list_lock);
@@ -284,7 +282,7 @@ struct l2cap_chan *l2cap_chan_create(struct sock *sk)
atomic_set(&chan->refcnt, 1); atomic_set(&chan->refcnt, 1);
BT_DBG("sk %p chan %p", sk, chan); BT_DBG("chan %p", chan);
return chan; return chan;
} }

4
net/bluetooth/l2cap_sock.c
View File

@@ -1048,12 +1048,14 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, int p
sk->sk_protocol = proto; sk->sk_protocol = proto;
sk->sk_state = BT_OPEN; sk->sk_state = BT_OPEN;
chan = l2cap_chan_create(sk); chan = l2cap_chan_create();
if (!chan) { if (!chan) {
l2cap_sock_kill(sk); l2cap_sock_kill(sk);
return NULL; return NULL;
} }
chan->sk = sk;
l2cap_pi(sk)->chan = chan; l2cap_pi(sk)->chan = chan;
return sk; return sk;