aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorArchie Pusaka <apusaka@chromium.org>2021-06-04 16:26:26 +0800
committerMarcel Holtmann <marcel@holtmann.org>2021-06-26 07:12:43 +0200
commit39bc74ca0119025e3cc24b97ebd964b5c605aa83 (patch)
tree0cd5b05bdaa64a8a7064b82a005dc57b9912c5cf /net/bluetooth/hci_event.c
parentBluetooth: use inclusive language in HCI role comments (diff)
downloadlinux-dev-39bc74ca0119025e3cc24b97ebd964b5c605aa83.tar.xz
linux-dev-39bc74ca0119025e3cc24b97ebd964b5c605aa83.zip
Bluetooth: use inclusive language when tracking connections
This patch replaces some non-inclusive terms based on the appropriate language mapping table compiled by the Bluetooth SIG: https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf Specifically, these terms are replaced: master -> central slave -> peripheral Signed-off-by: Archie Pusaka <apusaka@chromium.org> Reviewed-by: Miao-chen Chou <mcchou@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index da013d485f14..e479dc44e572 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -5384,9 +5384,9 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,
return NULL;
/* Most controller will fail if we try to create new connections
- * while we have an existing one in slave role.
+ * while we have an existing one in peripheral role.
*/
- if (hdev->conn_hash.le_num_slave > 0 &&
+ if (hdev->conn_hash.le_num_peripheral > 0 &&
(!test_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks) ||
!(hdev->le_states[3] & 0x10)))
return NULL;