aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-28 00:57:28 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-28 00:57:28 -0800
commit46976c042ba1ff59253f2f7a513099175c24794e (patch)
treea7af3f1c3ef2a2d430c49fb774ab744c296a2285 /include/net
parent024c378f0b719d43b01b875caefa19f2612e103a (diff)
parentf6e623a65cb301088bd04794043e82bfc996c512 (diff)
downloadkernel_samsung_crespo-46976c042ba1ff59253f2f7a513099175c24794e.zip
kernel_samsung_crespo-46976c042ba1ff59253f2f7a513099175c24794e.tar.gz
kernel_samsung_crespo-46976c042ba1ff59253f2f7a513099175c24794e.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'include/net')
-rw-r--r--include/net/bluetooth/hci.h6
-rw-r--r--include/net/bluetooth/hci_core.h5
2 files changed, 9 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index ed3aea1..fc0c502 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -43,7 +43,7 @@
#define HCI_NOTIFY_CONN_DEL 2
#define HCI_NOTIFY_VOICE_SETTING 3
-/* HCI device types */
+/* HCI bus types */
#define HCI_VIRTUAL 0
#define HCI_USB 1
#define HCI_PCCARD 2
@@ -52,6 +52,10 @@
#define HCI_PCI 5
#define HCI_SDIO 6
+/* HCI controller types */
+#define HCI_BREDR 0x00
+#define HCI_80211 0x01
+
/* HCI device quirks */
enum {
HCI_QUIRK_NO_RESET,
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 7b86094a..ce3c99e 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -70,7 +70,8 @@ struct hci_dev {
char name[8];
unsigned long flags;
__u16 id;
- __u8 type;
+ __u8 bus;
+ __u8 dev_type;
bdaddr_t bdaddr;
__u8 dev_name[248];
__u8 dev_class[3];
@@ -134,6 +135,8 @@ struct hci_dev {
atomic_t promisc;
+ struct dentry *debugfs;
+
struct device *parent;
struct device dev;