mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-01 02:33:57 +00:00
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>
This commit is contained in:
parent
74be523ce6
commit
39bc74ca01
@ -122,7 +122,7 @@ struct hci_conn_hash {
|
||||
unsigned int amp_num;
|
||||
unsigned int sco_num;
|
||||
unsigned int le_num;
|
||||
unsigned int le_num_slave;
|
||||
unsigned int le_num_peripheral;
|
||||
};
|
||||
|
||||
struct bdaddr_list {
|
||||
@ -894,7 +894,7 @@ static inline void hci_conn_hash_add(struct hci_dev *hdev, struct hci_conn *c)
|
||||
case LE_LINK:
|
||||
h->le_num++;
|
||||
if (c->role == HCI_ROLE_SLAVE)
|
||||
h->le_num_slave++;
|
||||
h->le_num_peripheral++;
|
||||
break;
|
||||
case SCO_LINK:
|
||||
case ESCO_LINK:
|
||||
@ -920,7 +920,7 @@ static inline void hci_conn_hash_del(struct hci_dev *hdev, struct hci_conn *c)
|
||||
case LE_LINK:
|
||||
h->le_num--;
|
||||
if (c->role == HCI_ROLE_SLAVE)
|
||||
h->le_num_slave--;
|
||||
h->le_num_peripheral--;
|
||||
break;
|
||||
case SCO_LINK:
|
||||
case ESCO_LINK:
|
||||
|
@ -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;
|
||||
|
@ -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) ||
|
||||
|
Loading…
Reference in New Issue
Block a user