The following commit has been merged in the batman-adv/next branch: commit f7c8663789038c4bc71b81e3c858a35c999347a8 Author: Masatake YAMATO yamato@redhat.com Date: Thu Jul 26 01:28:36 2012 +0900

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

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

Signed-off-by: Masatake YAMATO yamato@redhat.com Signed-off-by: Gustavo Padovan gustavo.padovan@collabora.co.uk

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index a7f04de..7c3d6c7 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -1100,21 +1100,30 @@ int __init hci_sock_init(void) return err;

err = bt_sock_register(BTPROTO_HCI, &hci_sock_family_ops); - if (err < 0) + if (err < 0) { + BT_ERR("HCI socket registration failed"); goto error; + } + + err = bt_procfs_init(THIS_MODULE, &init_net, "hci", &hci_sk_list, NULL); + if (err < 0) { + BT_ERR("Failed to create HCI proc file"); + bt_sock_unregister(BTPROTO_HCI); + goto error; + }

BT_INFO("HCI socket layer initialized");

return 0;

error: - BT_ERR("HCI socket registration failed"); proto_unregister(&hci_sk_proto); return err; }

void hci_sock_cleanup(void) { + bt_procfs_cleanup(&init_net, "hci"); if (bt_sock_unregister(BTPROTO_HCI) < 0) BT_ERR("HCI socket unregistration failed");