diff options
| author | Gustavo Padovan | 2013-10-16 00:24:51 +0200 |
|---|---|---|
| committer | Marcel Holtmann | 2013-10-16 01:42:45 +0200 |
| commit | 74e7574066e020dca8ad8a57927470e67ea91394 (patch) | |
| tree | becd92c0eb03be5527fc1148296a48210339426d /net/bluetooth/l2cap_core.c | |
| parent | Bluetooth: Move l2cap_wait_ack() to l2cap_sock.c (diff) | |
| download | kernel-qcow2-linux-74e7574066e020dca8ad8a57927470e67ea91394.tar.gz kernel-qcow2-linux-74e7574066e020dca8ad8a57927470e67ea91394.tar.xz kernel-qcow2-linux-74e7574066e020dca8ad8a57927470e67ea91394.zip | |
Bluetooth: use l2cap_chan_ready() instead of duplicate code
In this case the replacement by l2cap_chan_ready() doesn't change the code
flow, the same operations will executed plus two others that have no
effect: the use of the parent socket, that a non-oriented channel doesn't
have and the reset of conf_state, which is also fine since the connection
is ready at this point.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 39f02c08a882..72ce21a822f7 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1450,12 +1450,7 @@ static void l2cap_conn_ready(struct l2cap_conn *conn) l2cap_chan_ready(chan); } else if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) { - struct sock *sk = chan->sk; - __clear_chan_timer(chan); - lock_sock(sk); - __l2cap_state_change(chan, BT_CONNECTED); - sk->sk_state_change(sk); - release_sock(sk); + l2cap_chan_ready(chan); } else if (chan->state == BT_CONNECT) { l2cap_do_start(chan); |