diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2021-08-20 16:40:38 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2021-08-30 16:49:26 +0200 |
| commit | 1eeaa1ae79d84df025eaca363fdce3f397313647 (patch) | |
| tree | 9da58a2fd0c0ecfa62d6d38b01575217cfcbff99 /net | |
| parent | 99c23da0eed4fd20cae8243f2b51e10e66aa0951 (diff) | |
| download | linux-1eeaa1ae79d84df025eaca363fdce3f397313647.tar.gz linux-1eeaa1ae79d84df025eaca363fdce3f397313647.tar.bz2 linux-1eeaa1ae79d84df025eaca363fdce3f397313647.zip | |
Bluetooth: Fix enabling advertising for central role
When disconnecting the advertising shall be re-enabled only when the
connection role is slave/peripheral as the central role use advertising
to connect it could end up enabling the instance 0x00 if there are other
advertising instances.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 0bca035bf2dc..293d4c9c4b09 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2351,7 +2351,7 @@ static void hci_cs_disconnect(struct hci_dev *hdev, u8 status) mgmt_disconnect_failed(hdev, &conn->dst, conn->type, conn->dst_type, status); - if (conn->type == LE_LINK) { + if (conn->type == LE_LINK && conn->role == HCI_ROLE_SLAVE) { hdev->cur_adv_instance = conn->adv_instance; hci_req_reenable_advertising(hdev); } @@ -2961,7 +2961,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) * or until a connection is created or until the Advertising * is timed out due to Directed Advertising." */ - if (conn->type == LE_LINK) { + if (conn->type == LE_LINK && conn->role == HCI_ROLE_SLAVE) { hdev->cur_adv_instance = conn->adv_instance; hci_req_reenable_advertising(hdev); } |