moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Added /proc/net/cmtp via bt_procfs_init()

Browse Source 
Added /proc/net/cmtp via bt_procfs_init().

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
This commit is contained in:
Masatake YAMATO
2012-07-26 01:28:07 +09:00
committed by Gustavo Padovan
parent 77cf5585a3
commit 8c8de589ce
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
net/bluetooth/cmtp/sock.c
View File

@@ -42,6 +42,10 @@
#include "cmtp.h" #include "cmtp.h"
static struct bt_sock_list cmtp_sk_list = {
.lock = __RW_LOCK_UNLOCKED(cmtp_sk_list.lock)
};
static int cmtp_sock_release(struct socket *sock) static int cmtp_sock_release(struct socket *sock)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
@@ -51,6 +55,8 @@ static int cmtp_sock_release(struct socket *sock)
if (!sk) if (!sk)
return 0; return 0;
bt_sock_unlink(&cmtp_sk_list, sk);
sock_orphan(sk); sock_orphan(sk);
sock_put(sk); sock_put(sk);
@@ -214,6 +220,8 @@ static int cmtp_sock_create(struct net *net, struct socket *sock, int protocol,
sk->sk_protocol = protocol; sk->sk_protocol = protocol;
sk->sk_state = BT_OPEN; sk->sk_state = BT_OPEN;
bt_sock_link(&cmtp_sk_list, sk);
return 0; return 0;
} }
@@ -232,19 +240,30 @@ int cmtp_init_sockets(void)
return err; return err;
err = bt_sock_register(BTPROTO_CMTP, &cmtp_sock_family_ops); err = bt_sock_register(BTPROTO_CMTP, &cmtp_sock_family_ops);
if (err < 0) if (err < 0) {
BT_ERR("Can't register CMTP socket");
goto error; goto error;
}
err = bt_procfs_init(THIS_MODULE, &init_net, "cmtp", &cmtp_sk_list, NULL);
if (err < 0) {
BT_ERR("Failed to create CMTP proc file");
bt_sock_unregister(BTPROTO_HIDP);
goto error;
}
BT_INFO("CMTP socket layer initialized");
return 0; return 0;
error: error:
BT_ERR("Can't register CMTP socket");
proto_unregister(&cmtp_proto); proto_unregister(&cmtp_proto);
return err; return err;
} }
void cmtp_cleanup_sockets(void) void cmtp_cleanup_sockets(void)
{ {
bt_procfs_cleanup(&init_net, "cmtp");
if (bt_sock_unregister(BTPROTO_CMTP) < 0) if (bt_sock_unregister(BTPROTO_CMTP) < 0)
BT_ERR("Can't unregister CMTP socket"); BT_ERR("Can't unregister CMTP socket");