leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: use inclusive language when tracking connections

Browse Source 
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>
This commit is contained in:
Archie Pusaka
2021-06-04 16:26:26 +08:00
committed by Marcel Holtmann
parent 74be523ce6
commit 39bc74ca01
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/bluetooth/hci_request.c
View File

@@ -1519,13 +1519,14 @@ static bool is_advertising_allowed(struct hci_dev *hdev, bool connectable)
if (hci_conn_num(hdev, LE_LINK) == 0)
return true;
/* Check le_states if there is any connection in slave role. */
if (hdev->conn_hash.le_num_slave > 0) {
/* Slave connection state and non connectable mode bit 20. */
/* Check le_states if there is any connection in peripheral role. */
if (hdev->conn_hash.le_num_peripheral > 0) {
/* Peripheral connection state and non connectable mode bit 20.
*/
if (!connectable && !(hdev->le_states[2] & 0x10))
return false;
/* Slave connection state and connectable mode bit 38
/* Peripheral connection state and connectable mode bit 38
* and scannable bit 21.
*/
if (connectable && (!(hdev->le_states[4] & 0x40) ||
@@ -1533,13 +1534,13 @@ static bool is_advertising_allowed(struct hci_dev *hdev, bool connectable)
return false;
}
/* Check le_states if there is any connection in master role. */
if (hci_conn_num(hdev, LE_LINK) != hdev->conn_hash.le_num_slave) {
/* Master connection state and non connectable mode bit 18. */
/* Check le_states if there is any connection in central role. */
if (hci_conn_num(hdev, LE_LINK) != hdev->conn_hash.le_num_peripheral) {
/* Central connection state and non connectable mode bit 18. */
if (!connectable && !(hdev->le_states[2] & 0x02))
return false;
/* Master connection state and connectable mode bit 35 and
/* Central connection state and connectable mode bit 35 and
* scannable 19.
*/
if (connectable && (!(hdev->le_states[4] & 0x08) ||