diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-02-21 21:49:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-02-21 21:49:15 -0800 |
| commit | c2395b56dd0a848f35813df6685d843574a09263 (patch) | |
| tree | cd7c5052e90b39b9e78562031e0d85c8d810348f /include | |
| parent | 22a4bcc2abf49bf6b888baeadcbe76279f3c45c7 (diff) | |
| parent | 51c6d71d1a689abfb51cdaf0cc10439f72d447da (diff) | |
Merge http://linux-mh.bkbits.net/bluetooth-2.6
into kernel.bkbits.net:/home/davem/bt-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 03c51bba58a3..3abfa7573864 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -119,6 +119,8 @@ struct hci_dev { struct proc_dir_entry *proc; #endif + struct class_device class_dev; + struct module *owner; int (*open)(struct hci_dev *hdev); @@ -385,8 +387,10 @@ 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); +int hci_register_sysfs(struct hci_dev *hdev); +void hci_unregister_sysfs(struct hci_dev *hdev); + +#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->class_dev.dev = (pdev)) /* ----- LMP capabilities ----- */ #define lmp_rswitch_capable(dev) (dev->features[0] & LMP_RSWITCH) |