git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Integrate low-level connections into the driver model
[pandora-kernel.git]
/
include
/
net
/
bluetooth
/
hci_core.h
diff --git
a/include/net/bluetooth/hci_core.h
b/include/net/bluetooth/hci_core.h
index
ae67b36
..
263e42b
100644
(file)
--- a/
include/net/bluetooth/hci_core.h
+++ b/
include/net/bluetooth/hci_core.h
@@
-124,8
+124,8
@@
struct hci_dev {
atomic_t promisc;
atomic_t promisc;
- struct device *
dev
;
- struct
class_device class_
dev;
+ struct device *
parent
;
+ struct
device
dev;
struct module *owner;
struct module *owner;
@@
-165,6
+165,10
@@
struct hci_conn {
struct timer_list disc_timer;
struct timer_list idle_timer;
struct timer_list disc_timer;
struct timer_list idle_timer;
+ struct work_struct work;
+
+ struct device dev;
+
struct hci_dev *hdev;
void *l2cap_data;
void *sco_data;
struct hci_dev *hdev;
void *l2cap_data;
void *sco_data;
@@
-412,8
+416,10
@@
static inline int hci_recv_frame(struct sk_buff *skb)
int hci_register_sysfs(struct hci_dev *hdev);
void hci_unregister_sysfs(struct hci_dev *hdev);
int hci_register_sysfs(struct hci_dev *hdev);
void hci_unregister_sysfs(struct hci_dev *hdev);
+void hci_conn_add_sysfs(struct hci_conn *conn);
+void hci_conn_del_sysfs(struct hci_conn *conn);
-#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->
class_dev.dev
= (pdev))
+#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->
parent
= (pdev))
/* ----- LMP capabilities ----- */
#define lmp_rswitch_capable(dev) ((dev)->features[0] & LMP_RSWITCH)
/* ----- LMP capabilities ----- */
#define lmp_rswitch_capable(dev) ((dev)->features[0] & LMP_RSWITCH)