Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8f1e1742233cd1c3444dfc6c945a2efb2814e157

Authored by David Vrabel
Committed by Gustavo F. Padovan
1 parent 29b4433d99
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff

drivers/bluetooth/btmrvl_main.c
Diff comments   View file @ 8f1e174
... ... @@ -117,8 +117,8 @@
117 117 (event->data[2] == MODULE_ALREADY_UP)) ?
118 118 "Bring-up succeed" : "Bring-up failed");
119 119  
120   - if (event->length > 3)
121   - priv->btmrvl_dev.dev_type = event->data[3];
  120 + if (event->length > 3 && event->data[3])
  121 + priv->btmrvl_dev.dev_type = HCI_AMP;
122 122 else
123 123 priv->btmrvl_dev.dev_type = HCI_BREDR;
124 124  
include/net/bluetooth/hci.h
Diff comments   View file @ 8f1e174
... ... @@ -54,7 +54,7 @@
54 54  
55 55 /* HCI controller types */
56 56 #define HCI_BREDR 0x00
57   -#define HCI_80211 0x01
  57 +#define HCI_AMP 0x01
58 58  
59 59 /* HCI device quirks */
60 60 enum {
net/bluetooth/hci_sysfs.c
Diff comments   View file @ 8f1e174
... ... @@ -196,8 +196,8 @@
196 196 switch (type) {
197 197 case HCI_BREDR:
198 198 return "BR/EDR";
199   - case HCI_80211:
200   - return "802.11";
  199 + case HCI_AMP:
  200 + return "AMP";
201 201 default:
202 202 return "UNKNOWN";
203 203 }