diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-07-05 02:27:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-07-05 02:27:41 -0700 |
| commit | 3a4bc6655cf539cc142eba68b223dd4bce3bb82b (patch) | |
| tree | e691ef119899afbfe7904c5fd628f21699db2467 /include | |
| parent | 5ade92b8d75798f314509605cf5c8e4082114aaf (diff) | |
| parent | 1dd7f7cab40e7e75f59e9fcff860b9bc65670e6e (diff) | |
Merge http://linux-mh.bkbits.net/bluetooth-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compat_ioctl.h | 4 | ||||
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 1 | ||||
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h index 356590d445af..f8159ddb6194 100644 --- a/include/linux/compat_ioctl.h +++ b/include/linux/compat_ioctl.h @@ -640,6 +640,10 @@ COMPATIBLE_IOCTL(CMTPCONNADD) COMPATIBLE_IOCTL(CMTPCONNDEL) COMPATIBLE_IOCTL(CMTPGETCONNLIST) COMPATIBLE_IOCTL(CMTPGETCONNINFO) +COMPATIBLE_IOCTL(HIDPCONNADD) +COMPATIBLE_IOCTL(HIDPCONNDEL) +COMPATIBLE_IOCTL(HIDPGETCONNLIST) +COMPATIBLE_IOCTL(HIDPGETCONNINFO) /* CAPI */ COMPATIBLE_IOCTL(CAPI_REGISTER) COMPATIBLE_IOCTL(CAPI_GET_MANUFACTURER) diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 0106480b3ab1..9c5436227ac7 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -46,6 +46,7 @@ #define BTPROTO_BNEP 4 #define BTPROTO_CMTP 5 #define BTPROTO_HIDP 6 +#define BTPROTO_AVDTP 7 #define SOL_HCI 0 #define SOL_L2CAP 6 diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 8308881479a8..63f73088b3ce 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -195,10 +195,8 @@ static inline long inquiry_entry_age(struct inquiry_entry *e) return jiffies - e->timestamp; } -struct inquiry_entry *inquiry_cache_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr); -void inquiry_cache_update(struct hci_dev *hdev, struct inquiry_info *info); -void inquiry_cache_flush(struct hci_dev *hdev); -int inquiry_cache_dump(struct hci_dev *hdev, int num, __u8 *buf); +struct inquiry_entry *hci_inquiry_cache_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr); +void hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_info *info); /* ----- HCI Connections ----- */ enum { |