Bluetooth: move l2cap_sock_release() to l2cap_sock.c

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 533bef5f6341bf3c23c898b7caa8c128345dbf9d..d0baf4163261ad679129611ef8f1aca790ef70ec 100644 (file)
--- a/include/net/bluetooth/l2cap.h
+++ b/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/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 74a3ea3625d6b4665e98b6e651814155c42c5983..5765a82cf380a19e1117578b450cf9bef9634000 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/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/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index c1455f72bf03178e45d23d7559d96b1c89c964a3..20efd240a786247781ad091fabcffb4d145edad4 100644 (file)
--- a/net/bluetooth/l2cap_sock.c
+++ b/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);