History

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

Luiz Augusto von Dentz says: ==================== bluetooth pull request for net: - Fix regression causing some HCI events to be discarded when they shouldn't. * tag 'for-net-2022-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth: Bluetooth: hci_sync: Cleanup hci_conn if it cannot be aborted Bluetooth: hci_event: Fix creating hci_conn object on error status Bluetooth: hci_event: Fix checking for invalid handle on error status ====================

Paolo Abeni committed 4 years ago

Commit febb2d22 parents d2b52ec 9b3628d5 files · +83 −43Browse files

Showing the changes to include (2 of 5 files). Show all

Unified · Split

2 files
  1. include/net/bluetooth/hci.h +1 −0
  2. include/net/bluetooth/hci_core.h +1 −1
include/net/bluetooth/hci.h+1−0
@@ -578,6 +578,7 @@ enum { · 577 unmodified lines
578578 #define HCI_ERROR_CONNECTION_TIMEOUT 0x08
579579 #define HCI_ERROR_REJ_LIMITED_RESOURCES 0x0d
580580 #define HCI_ERROR_REJ_BAD_ADDR 0x0f
581+#define HCI_ERROR_INVALID_PARAMETERS 0x12
581582 #define HCI_ERROR_REMOTE_USER_TERM 0x13
582583 #define HCI_ERROR_REMOTE_LOW_RESOURCES 0x14
583584 #define HCI_ERROR_REMOTE_POWER_OFF 0x15
include/net/bluetooth/hci_core.h+1−1
@@ -1156,7 +1156,7 @@ int hci_conn_switch_role(struct hci_conn *conn, __u8 role); · 1155 unmodified lines
11561156
11571157 void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active);
11581158
1159−void hci_le_conn_failed(struct hci_conn *conn, u8 status);
1159+void hci_conn_failed(struct hci_conn *conn, u8 status);
11601160
11611161 /*
11621162 * hci_conn_get() and hci_conn_put() are used to control the life-time of an

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t