AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Bluetooth: use inclusive language in HCI role comments

Browse Source 
[ Upstream commit 74be523ce6bed0531e4f31c3e1387909589e9bfe ]

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 -> initiator (for smp) or central (everything else)
slave  -> responder (for smp) or peripheral (everything else)

The #define preprocessor terms are unchanged for now to not disturb
dependent APIs.

Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Archie Pusaka 2021-06-04 16:26:25 +08:00 committed by Greg Kroah-Hartman
parent c024f6f11d
commit d763aa352c
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/bluetooth/hci_conn.c
View File

@ -240,7 +240,7 @@ int hci_disconnect(struct hci_conn *conn, __u8 reason)
{ {
BT_DBG("hcon %p", conn); BT_DBG("hcon %p", conn);
/* When we are master of an established connection and it enters /* When we are central of an established connection and it enters
* the disconnect timeout, then go ahead and try to read the * the disconnect timeout, then go ahead and try to read the
* current clock offset. Processing of the result is done * current clock offset. Processing of the result is done
* within the event handling and hci_clock_offset_evt function. * within the event handling and hci_clock_offset_evt function.
@ -1065,16 +1065,16 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
hci_req_init(&req, hdev); hci_req_init(&req, hdev);
/* Disable advertising if we're active. For master role /* Disable advertising if we're active. For central role
* connections most controllers will refuse to connect if * connections most controllers will refuse to connect if
* advertising is enabled, and for slave role connections we * advertising is enabled, and for peripheral role connections we
* anyway have to disable it in order to start directed * anyway have to disable it in order to start directed
* advertising. * advertising.
*/ */
if (hci_dev_test_flag(hdev, HCI_LE_ADV)) if (hci_dev_test_flag(hdev, HCI_LE_ADV))
__hci_req_disable_advertising(&req); __hci_req_disable_advertising(&req);
/* If requested to connect as slave use directed advertising */ /* If requested to connect as peripheral use directed advertising */
if (conn->role == HCI_ROLE_SLAVE) { if (conn->role == HCI_ROLE_SLAVE) {
/* If we're active scanning most controllers are unable /* If we're active scanning most controllers are unable
* to initiate advertising. Simply reject the attempt. * to initiate advertising. Simply reject the attempt.

6
net/bluetooth/hci_event.c
View File

@ -2759,9 +2759,9 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
bacpy(&cp.bdaddr, &ev->bdaddr); bacpy(&cp.bdaddr, &ev->bdaddr);
if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_MASTER)) if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_MASTER))
cp.role = 0x00; /* Become master */ cp.role = 0x00; /* Become central */
else else
cp.role = 0x01; /* Remain slave */ cp.role = 0x01; /* Remain peripheral */
hci_send_cmd(hdev, HCI_OP_ACCEPT_CONN_REQ, sizeof(cp), &cp); hci_send_cmd(hdev, HCI_OP_ACCEPT_CONN_REQ, sizeof(cp), &cp);
} else if (!(flags & HCI_PROTO_DEFER)) { } else if (!(flags & HCI_PROTO_DEFER)) {
@ -5153,7 +5153,7 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,
conn->dst_type = bdaddr_type; conn->dst_type = bdaddr_type;
/* If we didn't have a hci_conn object previously /* If we didn't have a hci_conn object previously
* but we're in master role this must be something * but we're in central role this must be something
* initiated using a white list. Since white list based * initiated using a white list. Since white list based
* connections are not "first class citizens" we don't * connections are not "first class citizens" we don't
* have full tracking of them. Therefore, we go ahead * have full tracking of them. Therefore, we go ahead

2
net/bluetooth/l2cap_core.c
View File

@ -1688,7 +1688,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
if (hcon->out) if (hcon->out)
smp_conn_security(hcon, hcon->pending_sec_level); smp_conn_security(hcon, hcon->pending_sec_level);
/* For LE slave connections, make sure the connection interval /* For LE peripheral connections, make sure the connection interval
* is in the range of the minimum and maximum interval that has * is in the range of the minimum and maximum interval that has
* been configured for this connection. If not, then trigger * been configured for this connection. If not, then trigger
* the connection update procedure. * the connection update procedure.

6
net/bluetooth/smp.c
View File

@ -909,8 +909,8 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
hcon->pending_sec_level = BT_SECURITY_HIGH; hcon->pending_sec_level = BT_SECURITY_HIGH;
} }
/* If both devices have Keyoard-Display I/O, the master /* If both devices have Keyboard-Display I/O, the initiator
* Confirms and the slave Enters the passkey. * Confirms and the responder Enters the passkey.
*/ */
if (smp->method == OVERLAP) { if (smp->method == OVERLAP) {
if (hcon->role == HCI_ROLE_MASTER) if (hcon->role == HCI_ROLE_MASTER)
@ -3076,7 +3076,7 @@ static void bredr_pairing(struct l2cap_chan *chan)
if (!test_bit(HCI_CONN_ENCRYPT, &hcon->flags)) if (!test_bit(HCI_CONN_ENCRYPT, &hcon->flags))
return; return;
/* Only master may initiate SMP over BR/EDR */ /* Only initiator may initiate SMP over BR/EDR */
if (hcon->role != HCI_ROLE_MASTER) if (hcon->role != HCI_ROLE_MASTER)
return; return;