aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/bluetooth/l2cap.h2
-rw-r--r--net/bluetooth/l2cap_core.c2
-rw-r--r--net/bluetooth/l2cap_sock.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index b3bb3d492fff..f70935000345 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -466,6 +466,6 @@ struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,
466void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *chan, int err); 466void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *chan, int err);
467struct l2cap_chan *l2cap_chan_alloc(struct sock *sk); 467struct l2cap_chan *l2cap_chan_alloc(struct sock *sk);
468void l2cap_chan_del(struct l2cap_chan *chan, int err); 468void l2cap_chan_del(struct l2cap_chan *chan, int err);
469int l2cap_do_connect(struct l2cap_chan *chan); 469int l2cap_chan_connect(struct l2cap_chan *chan);
470 470
471#endif /* __L2CAP_H */ 471#endif /* __L2CAP_H */
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 190b04960dae..29742d875e60 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -847,7 +847,7 @@ static struct sock *l2cap_get_sock_by_psm(int state, __le16 psm, bdaddr_t *src)
847 return node ? sk : sk1; 847 return node ? sk : sk1;
848} 848}
849 849
850int l2cap_do_connect(struct l2cap_chan *chan) 850int l2cap_chan_connect(struct l2cap_chan *chan)
851{ 851{
852 struct sock *sk = chan->sk; 852 struct sock *sk = chan->sk;
853 bdaddr_t *src = &bt_sk(sk)->src; 853 bdaddr_t *src = &bt_sk(sk)->src;
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index a29782a0083a..50437c665d1e 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -229,7 +229,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al
229 l2cap_pi(sk)->psm = la.l2_psm; 229 l2cap_pi(sk)->psm = la.l2_psm;
230 l2cap_pi(sk)->dcid = la.l2_cid; 230 l2cap_pi(sk)->dcid = la.l2_cid;
231 231
232 err = l2cap_do_connect(l2cap_pi(sk)->chan); 232 err = l2cap_chan_connect(l2cap_pi(sk)->chan);
233 if (err) 233 if (err)
234 goto done; 234 goto done;
235 235