From f3e79397ffaf5543564bf55e7e35c475ffbc1ecd Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Fri, 4 Feb 2011 02:36:42 -0200
Subject: [PATCH] --- yaml --- r: 237335 b: refs/heads/master c:
 554f05bb8a0707dcc0ba4ea1dba1fb9970846ab5 h: refs/heads/master i:   237333:
 70b1155bb4993fcdb0a82827bc67cdbd4d60ad92   237331:
 a3b1f219d6dfb3524d0964cfd2db428080a1f03c   237327:
 e5bcbe28f0d1ccb431f83e5d5e6e9c2ca51f96c0 v: v3

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

diff --git a/[refs] b/[refs]
index 677f348ac8cd..84bcd7492923 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65390587c7bcf8bb60b48387db766d8d7dfea982
+refs/heads/master: 554f05bb8a0707dcc0ba4ea1dba1fb9970846ab5
diff --git a/trunk/include/net/bluetooth/l2cap.h b/trunk/include/net/bluetooth/l2cap.h
index 533bef5f6341..d0baf4163261 100644
--- a/trunk/include/net/bluetooth/l2cap.h
+++ b/trunk/include/net/bluetooth/l2cap.h
@@ -438,7 +438,6 @@ void l2cap_sock_init(struct sock *sk, struct sock *parent);
 struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,
 							int proto, gfp_t prio);
 
-int l2cap_sock_release(struct socket *sock);
 int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen);
 int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int flags);
 int l2cap_sock_listen(struct socket *sock, int backlog);
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index 74a3ea3625d6..5765a82cf380 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -2159,23 +2159,6 @@ int l2cap_sock_shutdown(struct socket *sock, int how)
 	return err;
 }
 
-int l2cap_sock_release(struct socket *sock)
-{
-	struct sock *sk = sock->sk;
-	int err;
-
-	BT_DBG("sock %p, sk %p", sock, sk);
-
-	if (!sk)
-		return 0;
-
-	err = l2cap_sock_shutdown(sock, 2);
-
-	sock_orphan(sk);
-	l2cap_sock_kill(sk);
-	return err;
-}
-
 static void l2cap_chan_ready(struct sock *sk)
 {
 	struct sock *parent = bt_sk(sk)->parent;
diff --git a/trunk/net/bluetooth/l2cap_sock.c b/trunk/net/bluetooth/l2cap_sock.c
index c1455f72bf03..20efd240a786 100644
--- a/trunk/net/bluetooth/l2cap_sock.c
+++ b/trunk/net/bluetooth/l2cap_sock.c
@@ -62,6 +62,23 @@ static void l2cap_sock_timeout(unsigned long arg)
 	sock_put(sk);
 }
 
+static int l2cap_sock_release(struct socket *sock)
+{
+	struct sock *sk = sock->sk;
+	int err;
+
+	BT_DBG("sock %p, sk %p", sock, sk);
+
+	if (!sk)
+		return 0;
+
+	err = l2cap_sock_shutdown(sock, 2);
+
+	sock_orphan(sk);
+	l2cap_sock_kill(sk);
+	return err;
+}
+
 static void l2cap_sock_destruct(struct sock *sk)
 {
 	BT_DBG("sk %p", sk);