From aabaf0f28717deae0798fec650aef22bed8ef67c Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Tue, 12 Apr 2011 18:17:14 -0300
Subject: [PATCH] --- yaml --- r: 247239 b: refs/heads/master c:
 77a74c7e0861e6ebac7effe233fd7e83f1ad9ecc h: refs/heads/master i:   247237:
 f4213f3f078d8e73690d200453ae05c67c099ced   247235:
 f9eb3c89f80d3edd3be04793759b55906b1fcba0   247231:
 c228e3f5b8fe7aadbee686684beec95d8450286a v: v3

---
 [refs]                              | 2 +-
 trunk/include/net/bluetooth/l2cap.h | 2 +-
 trunk/net/bluetooth/l2cap_core.c    | 2 +-
 trunk/net/bluetooth/l2cap_sock.c    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 58ef3ee5083d..39709cb4fd91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b44500351845e4f6df0d752a8870da246be8216f
+refs/heads/master: 77a74c7e0861e6ebac7effe233fd7e83f1ad9ecc
diff --git a/trunk/include/net/bluetooth/l2cap.h b/trunk/include/net/bluetooth/l2cap.h
index b3bb3d492fff..f70935000345 100644
--- a/trunk/include/net/bluetooth/l2cap.h
+++ b/trunk/include/net/bluetooth/l2cap.h
@@ -466,6 +466,6 @@ struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,
 void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *chan, int err);
 struct l2cap_chan *l2cap_chan_alloc(struct sock *sk);
 void l2cap_chan_del(struct l2cap_chan *chan, int err);
-int l2cap_do_connect(struct l2cap_chan *chan);
+int l2cap_chan_connect(struct l2cap_chan *chan);
 
 #endif /* __L2CAP_H */
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index 190b04960dae..29742d875e60 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -847,7 +847,7 @@ static struct sock *l2cap_get_sock_by_psm(int state, __le16 psm, bdaddr_t *src)
 	return node ? sk : sk1;
 }
 
-int l2cap_do_connect(struct l2cap_chan *chan)
+int l2cap_chan_connect(struct l2cap_chan *chan)
 {
 	struct sock *sk = chan->sk;
 	bdaddr_t *src = &bt_sk(sk)->src;
diff --git a/trunk/net/bluetooth/l2cap_sock.c b/trunk/net/bluetooth/l2cap_sock.c
index a29782a0083a..50437c665d1e 100644
--- a/trunk/net/bluetooth/l2cap_sock.c
+++ b/trunk/net/bluetooth/l2cap_sock.c
@@ -229,7 +229,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al
 	l2cap_pi(sk)->psm = la.l2_psm;
 	l2cap_pi(sk)->dcid = la.l2_cid;
 
-	err = l2cap_do_connect(l2cap_pi(sk)->chan);
+	err = l2cap_chan_connect(l2cap_pi(sk)->chan);
 	if (err)
 		goto done;