diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-25 09:30:56 -0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-06-05 06:34:10 +0300 |
| commit | 6754e0df133b088aa97ae6f2d3fd5377e43d1fc6 (patch) | |
| tree | d37146e88c2b8878cb0dcee426626ec5cfae075c /net | |
| parent | 2f84a2e6a6978810b06b5f33892152183f1dace9 (diff) | |
| download | blackbird-op-linux-6754e0df133b088aa97ae6f2d3fd5377e43d1fc6.tar.gz blackbird-op-linux-6754e0df133b088aa97ae6f2d3fd5377e43d1fc6.zip | |
Bluetooth: Use l2cap_chan_ready() in LE path
This replace code in l2cap_le_conn_ready() by a similar code in
l2cap_chan_ready().
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 0d556f7faaf6..de0dc9ec9862 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1228,10 +1228,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) l2cap_chan_add(conn, chan); - __set_chan_timer(chan, sk->sk_sndtimeo); - - __l2cap_state_change(chan, BT_CONNECTED); - parent->sk_data_ready(parent, 0); + l2cap_chan_ready(chan); clean: release_sock(parent); |
