Commit ef365da1 authored by Archie Pusaka's avatar Archie Pusaka Committed by Marcel Holtmann
Browse files

Bluetooth: use inclusive language in HCI LE features 

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: default avatarArchie Pusaka <apusaka@chromium.org>
Reviewed-by: default avatarMiao-chen Chou <mcchou@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 6397729b

include/net/bluetooth/hci.h

+3 −3
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ enum { 
/* LE features */

#define HCI_LE_ENCRYPTION		0x01

#define HCI_LE_CONN_PARAM_REQ_PROC	0x02

#define HCI_LE_SLAVE_FEATURES		0x08

#define HCI_LE_PERIPHERAL_FEATURES	0x08

#define HCI_LE_PING			0x10

#define HCI_LE_DATA_LEN_EXT		0x20

#define HCI_LE_LL_PRIVACY		0x40
@@ -498,8 +498,8 @@ enum { 
#define HCI_LE_PHY_CODED		0x08

#define HCI_LE_EXT_ADV			0x10

#define HCI_LE_CHAN_SEL_ALG2		0x40

#define HCI_LE_CIS_MASTER		0x10

#define HCI_LE_CIS_SLAVE		0x20

#define HCI_LE_CIS_CENTRAL		0x10

#define HCI_LE_CIS_PERIPHERAL		0x20



/* Connection modes */

#define HCI_CM_ACTIVE	0x0000

net/bluetooth/hci_event.c

+7 −7
Original line number Diff line number Diff line
@@ -5243,17 +5243,17 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status, 
	hci_debugfs_create_conn(conn);

	hci_conn_add_sysfs(conn);



	/* The remote features procedure is defined for master

	/* The remote features procedure is defined for central

	 * role only. So only in case of an initiated connection

	 * request the remote features.

	 *

	 * If the local controller supports slave-initiated features

	 * exchange, then requesting the remote features in slave

	 * If the local controller supports peripheral-initiated features

	 * exchange, then requesting the remote features in peripheral

	 * role is possible. Otherwise just transition into the

	 * connected state without requesting the remote features.

	 */

	if (conn->out ||

	    (hdev->le_features[0] & HCI_LE_SLAVE_FEATURES)) {

	    (hdev->le_features[0] & HCI_LE_PERIPHERAL_FEATURES)) {

		struct hci_cp_le_read_remote_features cp;



		cp.handle = __cpu_to_le16(conn->handle);
@@ -5774,7 +5774,7 @@ static void hci_le_remote_feat_complete_evt(struct hci_dev *hdev, 
		if (conn->state == BT_CONFIG) {

			__u8 status;



			/* If the local controller supports slave-initiated

			/* If the local controller supports peripheral-initiated

			 * features exchange, but the remote controller does

			 * not, then it is possible that the error code 0x1a

			 * for unsupported remote feature gets returned.
@@ -5783,8 +5783,8 @@ static void hci_le_remote_feat_complete_evt(struct hci_dev *hdev, 
			 * transition into connected state and mark it as

			 * successful.

			 */

			if ((hdev->le_features[0] & HCI_LE_SLAVE_FEATURES) &&

			    !conn->out && ev->status == 0x1a)

			if (!conn->out && ev->status == 0x1a &&

			    (hdev->le_features[0] & HCI_LE_PERIPHERAL_FEATURES))

				status = 0x00;

			else

				status = ev->status;