diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/net/bluetooth/hci.h | 3 | ||||
-rw-r--r-- | include/net/bluetooth/hci_core.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 5d033dc9d43b..51c9df16e764 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
@@ -76,6 +76,9 @@ enum { | |||
76 | HCI_INQUIRY, | 76 | HCI_INQUIRY, |
77 | 77 | ||
78 | HCI_RAW, | 78 | HCI_RAW, |
79 | |||
80 | HCI_SETUP, | ||
81 | HCI_AUTO_OFF, | ||
79 | }; | 82 | }; |
80 | 83 | ||
81 | /* HCI ioctl defines */ | 84 | /* HCI ioctl defines */ |
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 4e14610baece..75c4f201c1c6 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -114,6 +114,10 @@ struct hci_dev { | |||
114 | 114 | ||
115 | struct workqueue_struct *workqueue; | 115 | struct workqueue_struct *workqueue; |
116 | 116 | ||
117 | struct work_struct power_on; | ||
118 | struct work_struct power_off; | ||
119 | struct timer_list off_timer; | ||
120 | |||
117 | struct tasklet_struct cmd_task; | 121 | struct tasklet_struct cmd_task; |
118 | struct tasklet_struct rx_task; | 122 | struct tasklet_struct rx_task; |
119 | struct tasklet_struct tx_task; | 123 | struct tasklet_struct tx_task; |
@@ -437,6 +441,8 @@ int hci_inquiry(void __user *arg); | |||
437 | struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr); | 441 | struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr); |
438 | int hci_blacklist_clear(struct hci_dev *hdev); | 442 | int hci_blacklist_clear(struct hci_dev *hdev); |
439 | 443 | ||
444 | void hci_del_off_timer(struct hci_dev *hdev); | ||
445 | |||
440 | void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb); | 446 | void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb); |
441 | 447 | ||
442 | int hci_recv_frame(struct sk_buff *skb); | 448 | int hci_recv_frame(struct sk_buff *skb); |