Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f1e1742 authored by David Vrabel's avatar David Vrabel Committed by Gustavo Padovan
Browse files

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: default avatarDavid Vrabel <david.vrabel@csr.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 29b4433d

drivers/bluetooth/btmrvl_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

include/net/bluetooth/hci.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 


/* HCI controller types */

#define HCI_BREDR	0x00

#define HCI_80211	0x01

#define HCI_AMP		0x01



/* HCI device quirks */

enum {

net/bluetooth/hci_sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -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";

	}