Improved support for /proc/bluetooth

- Convert /proc/bluetoth/l2cap to seq_file
- Convert /proc/bluetoth/rfcomm to seq_file
- Convert /proc/bluetooth/sco to seq_file
- Export HCI device info via /proc/bluetooth/hci/N
	 

3 files changed, 16 insertions, 2 deletions

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index de82c1873153..7ca9999a5d88 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -63,6 +63,8 @@
 #define BT_DMP(D...)
 #endif
 
+extern struct proc_dir_entry *proc_bt;
+
 /* Connection and socket states */
 enum {
 	BT_CONNECTED = 1, /* Equal to TCP_ESTABLISHED to make net code happy */
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 0bd35327173e..852e6ef40901 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -29,6 +29,7 @@
 #ifndef __HCI_CORE_H
 #define __HCI_CORE_H
 
+#include <linux/proc_fs.h>
 #include <net/bluetooth/hci.h>
 
 /* HCI upper protocols */
@@ -37,6 +38,8 @@
 
 #define HCI_INIT_TIMEOUT (HZ * 10)
 
+extern struct proc_dir_entry *proc_bt_hci;
+
 /* HCI Core structures */
 
 struct inquiry_entry {
@@ -111,6 +114,10 @@ struct hci_dev {
 
 	atomic_t 		promisc;
 
+#ifdef CONFIG_PROC_FS
+	struct proc_dir_entry   *proc;
+#endif
+
 	int (*open)(struct hci_dev *hdev);
 	int (*close)(struct hci_dev *hdev);
 	int (*flush)(struct hci_dev *hdev);
@@ -148,8 +155,8 @@ struct hci_conn {
 };
 
 extern struct hci_proto *hci_proto[];
-extern struct list_head hdev_list;
-extern rwlock_t hdev_list_lock;
+extern struct list_head hci_dev_list;
+extern rwlock_t hci_dev_list_lock;
 
 /* ----- Inquiry cache ----- */
 #define INQUIRY_CACHE_AGE_MAX   (HZ*30)   // 30 seconds
@@ -345,6 +352,9 @@ static inline int hci_recv_frame(struct sk_buff *skb)
 	return 0;
 }
 
+int  hci_dev_proc_init(struct hci_dev *hdev);
+void hci_dev_proc_cleanup(struct hci_dev *hdev);
+
 /* ----- LMP capabilities ----- */
 #define lmp_rswitch_capable(dev) (dev->features[0] & LMP_RSWITCH)
 #define lmp_encrypt_capable(dev) (dev->features[0] & LMP_ENCRYPT)
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
index b4c6b6f73a09..73d85aae16f9 100644
--- a/include/net/bluetooth/rfcomm.h
+++ b/include/net/bluetooth/rfcomm.h
@@ -345,4 +345,6 @@ int  rfcomm_dev_ioctl(struct sock *sk, unsigned int cmd, unsigned long arg);
 int  rfcomm_init_ttys(void);
 void rfcomm_cleanup_ttys(void);
 
+extern struct proc_dir_entry *proc_bt_rfcomm;
+
 #endif /* __RFCOMM_H */