summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_core.c
diff options
context:
space:
mode:
authorGustavo Padovan2012-10-06 12:34:52 +0200
committerGustavo Padovan2012-10-12 12:21:00 +0200
commit1d8b1fd55aa1dfa9edd74ebb467db9358fa56f8a (patch)
tree9ad594ce022c6db60e97db3d1587335ed64eef35 /net/bluetooth/l2cap_core.c
parentBluetooth: Remove GFP_ATOMIC usage from l2cap_core.c (diff)
downloadkernel-qcow2-linux-1d8b1fd55aa1dfa9edd74ebb467db9358fa56f8a.tar.gz
kernel-qcow2-linux-1d8b1fd55aa1dfa9edd74ebb467db9358fa56f8a.tar.xz
kernel-qcow2-linux-1d8b1fd55aa1dfa9edd74ebb467db9358fa56f8a.zip
Bluetooth: use l2cap_chan_set_err()
l2cap_conn_unreliable() doesn't take the sk lock, so we need to take it using l2cap_chan_set_err(). Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 207b4a868485..bca3dd91bcbc 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1299,7 +1299,7 @@ static void l2cap_conn_unreliable(struct l2cap_conn *conn, int err)
list_for_each_entry(chan, &conn->chan_l, list) {
if (test_bit(FLAG_FORCE_RELIABLE, &chan->flags))
- __l2cap_chan_set_err(chan, err);
+ l2cap_chan_set_err(chan, err);
}
mutex_unlock(&conn->chan_lock);