redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Bluetooth: HCI devices are either BR/EDR or AMP radios

Browse source 
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>
This commit is contained in:
David Vrabel 2010-08-09 17:38:10 -04:00 committed by Gustavo F. Padovan
parent 29b4433d99
commit 8f1e174223
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/bluetooth/btmrvl_main.c
View file

@ -117,8 +117,8 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
(event->data[2] == MODULE_ALREADY_UP)) ? (event->data[2] == MODULE_ALREADY_UP)) ?
"Bring-up succeed" : "Bring-up failed"); "Bring-up succeed" : "Bring-up failed");
if (event->length > 3) if (event->length > 3 && event->data[3])
priv->btmrvl_dev.dev_type = event->data[3]; priv->btmrvl_dev.dev_type = HCI_AMP;
else else
priv->btmrvl_dev.dev_type = HCI_BREDR; priv->btmrvl_dev.dev_type = HCI_BREDR;

2
include/net/bluetooth/hci.h
View file

@ -54,7 +54,7 @@
/* HCI controller types */ /* HCI controller types */
#define HCI_BREDR 0x00 #define HCI_BREDR 0x00
#define HCI_80211 0x01 #define HCI_AMP 0x01
/* HCI device quirks */ /* HCI device quirks */
enum { enum {

4
net/bluetooth/hci_sysfs.c
View file

@ -196,8 +196,8 @@ static inline char *host_typetostr(int type)
switch (type) { switch (type) {
case HCI_BREDR: case HCI_BREDR:
return "BR/EDR"; return "BR/EDR";
case HCI_80211: case HCI_AMP:
return "802.11"; return "AMP";
default: default:
return "UNKNOWN"; return "UNKNOWN";
} }