aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarcel Holtmann2010-02-08 15:27:07 +0100
committerMarcel Holtmann2010-02-27 14:05:38 +0100
commitc13854cef4751000b968d4e8ac95796562d5b96f (patch)
tree0955205615783cfdf112c9bbf264ef1fe57409ed /include
parent10f7891f998e84acfa31ac9c5a0fea052c39ecb8 (diff)
Bluetooth: Convert controller hdev->type to hdev->bus
The hdev->type is misnamed and should be actually hdev->bus instead. So convert it now. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/hci.h2
-rw-r--r--include/net/bluetooth/hci_core.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index ed3aea1605e8..3350a665180f 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
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 7b86094a894b..7e65885290d5 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -70,7 +70,7 @@ struct hci_dev {
char name[8];
unsigned long flags;
__u16 id;
- __u8 type;
+ __u8 bus;
bdaddr_t bdaddr;
__u8 dev_name[248];
__u8 dev_class[3];