aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_core.c
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-10-12 07:40:40 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-10-15 08:44:24 -0400
commit300229f962b36e292524b26c86962d7339010b44 (patch)
tree0effbcf2941a88f6ea4b4924721659c3c478756a /net/bluetooth/l2cap_core.c
parent2dc4e5105f012bda7eef2f459ed3d5299ded9672 (diff)
Bluetooth: Rename __l2cap_connect() to l2cap_connect()
Use of "__" usually means we need to call the function with a lock held, which is not the case here. 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 314d95580d73..fca407e17f16 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3391,8 +3391,8 @@ static inline int l2cap_command_rej(struct l2cap_conn *conn,
3391 return 0; 3391 return 0;
3392} 3392}
3393 3393
3394static void __l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, 3394static void l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd,
3395 u8 *data, u8 rsp_code, u8 amp_id) 3395 u8 *data, u8 rsp_code, u8 amp_id)
3396{ 3396{
3397 struct l2cap_conn_req *req = (struct l2cap_conn_req *) data; 3397 struct l2cap_conn_req *req = (struct l2cap_conn_req *) data;
3398 struct l2cap_conn_rsp rsp; 3398 struct l2cap_conn_rsp rsp;
@@ -3512,7 +3512,7 @@ sendresp:
3512static int l2cap_connect_req(struct l2cap_conn *conn, 3512static int l2cap_connect_req(struct l2cap_conn *conn,
3513 struct l2cap_cmd_hdr *cmd, u8 *data) 3513 struct l2cap_cmd_hdr *cmd, u8 *data)
3514{ 3514{
3515 __l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP, 0); 3515 l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP, 0);
3516 return 0; 3516 return 0;
3517} 3517}
3518 3518