Commit beb43252 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'for-net-2022-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 



Luiz Augusto von Dentz says:

====================
bluetooth pull request for net:

 - Fix regression preventing ACL packet transmission
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1621e70f be318363

net/bluetooth/hci_sync.c

+6 −6
Original line number Diff line number Diff line
@@ -3018,12 +3018,6 @@ static const struct hci_init_stage amp_init2[] = { 
/* Read Buffer Size (ACL mtu, max pkt, etc.) */

static int hci_read_buffer_size_sync(struct hci_dev *hdev)

{

	/* Use Read LE Buffer Size V2 if supported */

	if (hdev->commands[41] & 0x20)

		return __hci_cmd_sync_status(hdev,

					     HCI_OP_LE_READ_BUFFER_SIZE_V2,

					     0, NULL, HCI_CMD_TIMEOUT);



	return __hci_cmd_sync_status(hdev, HCI_OP_READ_BUFFER_SIZE,

				     0, NULL, HCI_CMD_TIMEOUT);

}
@@ -3237,6 +3231,12 @@ static const struct hci_init_stage hci_init2[] = { 
/* Read LE Buffer Size */

static int hci_le_read_buffer_size_sync(struct hci_dev *hdev)

{

	/* Use Read LE Buffer Size V2 if supported */

	if (hdev->commands[41] & 0x20)

		return __hci_cmd_sync_status(hdev,

					     HCI_OP_LE_READ_BUFFER_SIZE_V2,

					     0, NULL, HCI_CMD_TIMEOUT);



	return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_BUFFER_SIZE,

				     0, NULL, HCI_CMD_TIMEOUT);

}