Commit 8c8de589 authored by Masatake YAMATO's avatar Masatake YAMATO Committed by Gustavo Padovan
Browse files

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



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

Signed-off-by: default avatarMasatake YAMATO <yamato@redhat.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 77cf5585

net/bluetooth/cmtp/sock.c

+21 −2
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ 


#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)

{

	struct sock *sk = sock->sk;
@@ -51,6 +55,8 @@ static int cmtp_sock_release(struct socket *sock) 
	if (!sk)

		return 0;



	bt_sock_unlink(&cmtp_sk_list, sk);



	sock_orphan(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_state    = BT_OPEN;



	bt_sock_link(&cmtp_sk_list, sk);



	return 0;

}
@@ -232,19 +240,30 @@ int cmtp_init_sockets(void) 
		return err;



	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;

	}



	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;



error:

	BT_ERR("Can't register CMTP socket");

	proto_unregister(&cmtp_proto);

	return err;

}



void cmtp_cleanup_sockets(void)

{

	bt_procfs_cleanup(&init_net, "cmtp");

	if (bt_sock_unregister(BTPROTO_CMTP) < 0)

		BT_ERR("Can't unregister CMTP socket");