Commit aee61f7a authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: hci_uart: Provide initial manufacturer information 



Provide an early indication about the manufacturer information so that
it can be forwarded into monitor channel.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 9f7378a9

drivers/bluetooth/hci_ath.c

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ static struct sk_buff *ath_dequeue(struct hci_uart *hu) 
static const struct hci_uart_proto athp = {

	.id		= HCI_UART_ATH3K,

	.name		= "ATH3K",

	.manufacturer	= 69,

	.open		= ath_open,

	.close		= ath_close,

	.flush		= ath_flush,

drivers/bluetooth/hci_bcm.c

+1 −0
Original line number Diff line number Diff line
@@ -799,6 +799,7 @@ static int bcm_remove(struct platform_device *pdev) 
static const struct hci_uart_proto bcm_proto = {

	.id		= HCI_UART_BCM,

	.name		= "BCM",

	.manufacturer	= 15,

	.init_speed	= 115200,

	.oper_speed	= 4000000,

	.open		= bcm_open,

drivers/bluetooth/hci_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -1148,6 +1148,7 @@ static struct sk_buff *intel_dequeue(struct hci_uart *hu) 
static const struct hci_uart_proto intel_proto = {

	.id		= HCI_UART_INTEL,

	.name		= "Intel",

	.manufacturer	= 2,

	.init_speed	= 115200,

	.oper_speed	= 3000000,

	.open		= intel_open,

drivers/bluetooth/hci_ldisc.c

+7 −0
Original line number Diff line number Diff line
@@ -587,6 +587,13 @@ static int hci_uart_register_dev(struct hci_uart *hu) 
	hdev->bus = HCI_UART;

	hci_set_drvdata(hdev, hu);



	/* Only when vendor specific setup callback is provided, consider

	 * the manufacturer information valid. This avoids filling in the

	 * value for Ericsson when nothing is specified.

	 */

	if (hu->proto->setup)

		hdev->manufacturer = hu->proto->manufacturer;



	hdev->open  = hci_uart_open;

	hdev->close = hci_uart_close;

	hdev->flush = hci_uart_flush;

drivers/bluetooth/hci_qca.c

+1 −0
Original line number Diff line number Diff line
@@ -947,6 +947,7 @@ static int qca_setup(struct hci_uart *hu) 
static struct hci_uart_proto qca_proto = {

	.id		= HCI_UART_QCA,

	.name		= "QCA",

	.manufacturer	= 29,

	.init_speed	= 115200,

	.oper_speed	= 3000000,

	.open		= qca_open,

CRA Git | Maintained and supported by SUSTech CRA and CCSE