diff options
| author | David Vrabel <david.vrabel@csr.com> | 2010-08-09 17:38:10 -0400 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-10-12 12:44:51 -0300 |
| commit | 8f1e1742233cd1c3444dfc6c945a2efb2814e157 (patch) | |
| tree | 252563ff2af556132d23f0edfd6bfa92a8a97dc5 | |
| parent | 29b4433d991c88d86ca48a4c1cc33c671475be4b (diff) | |
| download | kernel_samsung_smdk4412-8f1e1742233cd1c3444dfc6c945a2efb2814e157.zip kernel_samsung_smdk4412-8f1e1742233cd1c3444dfc6c945a2efb2814e157.tar.gz kernel_samsung_smdk4412-8f1e1742233cd1c3444dfc6c945a2efb2814e157.tar.bz2 | |
Bluetooth: HCI devices are either BR/EDR or AMP radios
HCI transport drivers may not know what type of radio an AMP device has
so only say whether they're BR/EDR or AMP devices.
Signed-off-by: David Vrabel <david.vrabel@csr.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
| -rw-r--r-- | drivers/bluetooth/btmrvl_main.c | 4 | ||||
| -rw-r--r-- | include/net/bluetooth/hci.h | 2 | ||||
| -rw-r--r-- | net/bluetooth/hci_sysfs.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c index 0d32ec8..548d1d9 100644 --- a/drivers/bluetooth/btmrvl_main.c +++ b/drivers/bluetooth/btmrvl_main.c @@ -117,8 +117,8 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) (event->data[2] == MODULE_ALREADY_UP)) ? "Bring-up succeed" : "Bring-up failed"); - if (event->length > 3) - priv->btmrvl_dev.dev_type = event->data[3]; + if (event->length > 3 && event->data[3]) + priv->btmrvl_dev.dev_type = HCI_AMP; else priv->btmrvl_dev.dev_type = HCI_BREDR; diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index bcbdd6d..e30e008 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -54,7 +54,7 @@ /* HCI controller types */ #define HCI_BREDR 0x00 -#define HCI_80211 0x01 +#define HCI_AMP 0x01 /* HCI device quirks */ enum { diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 8fb967b..1a9f0db 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c @@ -196,8 +196,8 @@ static inline char *host_typetostr(int type) switch (type) { case HCI_BREDR: return "BR/EDR"; - case HCI_80211: - return "802.11"; + case HCI_AMP: + return "AMP"; default: return "UNKNOWN"; } |