* [PATCH v2 1/8] Bluetooth: use inclusive language in HCI role
2021-05-31 8:37 [PATCH v2 0/8] Bluetooth: use inclusive language Archie Pusaka
@ 2021-05-31 8:37 ` Archie Pusaka
2021-06-02 19:55 ` Marcel Holtmann
2021-05-31 8:37 ` [PATCH v2 2/8] Bluetooth: use inclusive language in hci_core.h Archie Pusaka
` (7 subsequent siblings)
8 siblings, 1 reply; 12+ messages in thread
From: Archie Pusaka @ 2021-05-31 8:37 UTC (permalink / raw)
To: linux-bluetooth, Marcel Holtmann
Cc: CrosBT Upstreaming, Archie Pusaka, Miao-chen Chou,
David S. Miller, Jakub Kicinski, Johan Hedberg,
Luiz Augusto von Dentz, linux-kernel, netdev
From: Archie Pusaka <apusaka@chromium.org>
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>
---
Changes in v2:
* Add details in commit message
include/net/bluetooth/hci.h | 6 +++---
include/net/bluetooth/hci_core.h | 4 ++--
net/bluetooth/amp.c | 2 +-
net/bluetooth/hci_conn.c | 30 +++++++++++++++---------------
net/bluetooth/hci_core.c | 6 +++---
net/bluetooth/hci_event.c | 20 ++++++++++----------
net/bluetooth/l2cap_core.c | 12 ++++++------
net/bluetooth/smp.c | 20 ++++++++++----------
8 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index c4b0650fb9ae..18742f4471ff 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -515,7 +515,7 @@ enum {
/* Link modes */
#define HCI_LM_ACCEPT 0x8000
-#define HCI_LM_MASTER 0x0001
+#define HCI_LM_CENTRAL 0x0001
#define HCI_LM_AUTH 0x0002
#define HCI_LM_ENCRYPT 0x0004
#define HCI_LM_TRUSTED 0x0008
@@ -573,8 +573,8 @@ enum {
#define HCI_TX_POWER_INVALID 127
#define HCI_RSSI_INVALID 127
-#define HCI_ROLE_MASTER 0x00
-#define HCI_ROLE_SLAVE 0x01
+#define HCI_ROLE_CENTRAL 0x00
+#define HCI_ROLE_PERIPHERAL 0x01
/* Extended Inquiry Response field types */
#define EIR_FLAGS 0x01 /* flags */
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 43b08bebae74..368e16fdf441 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -893,7 +893,7 @@ static inline void hci_conn_hash_add(struct hci_dev *hdev, struct hci_conn *c)
break;
case LE_LINK:
h->le_num++;
- if (c->role == HCI_ROLE_SLAVE)
+ if (c->role == HCI_ROLE_PERIPHERAL)
h->le_num_slave++;
break;
case SCO_LINK:
@@ -919,7 +919,7 @@ static inline void hci_conn_hash_del(struct hci_dev *hdev, struct hci_conn *c)
break;
case LE_LINK:
h->le_num--;
- if (c->role == HCI_ROLE_SLAVE)
+ if (c->role == HCI_ROLE_PERIPHERAL)
h->le_num_slave--;
break;
case SCO_LINK:
diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c
index be2d469d6369..fe0083c94019 100644
--- a/net/bluetooth/amp.c
+++ b/net/bluetooth/amp.c
@@ -107,7 +107,7 @@ struct hci_conn *phylink_add(struct hci_dev *hdev, struct amp_mgr *mgr,
{
bdaddr_t *dst = &mgr->l2cap_conn->hcon->dst;
struct hci_conn *hcon;
- u8 role = out ? HCI_ROLE_MASTER : HCI_ROLE_SLAVE;
+ u8 role = out ? HCI_ROLE_CENTRAL : HCI_ROLE_PERIPHERAL;
hcon = hci_conn_add(hdev, AMP_LINK, dst, role);
if (!hcon)
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 88ec08978ff4..703470b6b924 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -222,7 +222,7 @@ static void hci_acl_create_connection(struct hci_conn *conn)
conn->state = BT_CONNECT;
conn->out = true;
- conn->role = HCI_ROLE_MASTER;
+ conn->role = HCI_ROLE_CENTRAL;
conn->attempt++;
@@ -245,7 +245,7 @@ static void hci_acl_create_connection(struct hci_conn *conn)
}
cp.pkt_type = cpu_to_le16(conn->pkt_type);
- if (lmp_rswitch_capable(hdev) && !(hdev->link_mode & HCI_LM_MASTER))
+ if (lmp_rswitch_capable(hdev) && !(hdev->link_mode & HCI_LM_CENTRAL))
cp.role_switch = 0x01;
else
cp.role_switch = 0x00;
@@ -257,12 +257,12 @@ int hci_disconnect(struct hci_conn *conn, __u8 reason)
{
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
* current clock offset. Processing of the result is done
* within the event handling and hci_clock_offset_evt function.
*/
- if (conn->type == ACL_LINK && conn->role == HCI_ROLE_MASTER &&
+ if (conn->type == ACL_LINK && conn->role == HCI_ROLE_CENTRAL &&
(conn->state == BT_CONNECTED || conn->state == BT_CONFIG)) {
struct hci_dev *hdev = conn->hdev;
struct hci_cp_read_clock_offset clkoff_cp;
@@ -538,7 +538,7 @@ static void le_conn_timeout(struct work_struct *work)
* happen with broken hardware or if low duty cycle was used
* (which doesn't have a timeout of its own).
*/
- if (conn->role == HCI_ROLE_SLAVE) {
+ if (conn->role == HCI_ROLE_PERIPHERAL) {
/* Disable LE Advertising */
le_disable_advertising(hdev);
hci_le_conn_failed(conn, HCI_ERROR_ADVERTISING_TIMEOUT);
@@ -580,7 +580,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,
/* Set Default Authenticated payload timeout to 30s */
conn->auth_payload_timeout = DEFAULT_AUTH_PAYLOAD_TIMEOUT;
- if (conn->role == HCI_ROLE_MASTER)
+ if (conn->role == HCI_ROLE_CENTRAL)
conn->out = true;
switch (type) {
@@ -1109,9 +1109,9 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
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
- * 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
* advertising. Any registered advertisements will be
* re-enabled after the connection attempt is finished.
@@ -1119,8 +1119,8 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
if (hci_dev_test_flag(hdev, HCI_LE_ADV))
__hci_req_pause_adv_instances(&req);
- /* If requested to connect as slave use directed advertising */
- if (conn->role == HCI_ROLE_SLAVE) {
+ /* If requested to connect as peripheral use directed advertising */
+ if (conn->role == HCI_ROLE_PERIPHERAL) {
/* If we're active scanning most controllers are unable
* to initiate advertising. Simply reject the attempt.
*/
@@ -1261,7 +1261,7 @@ struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst,
BT_DBG("requesting refresh of dst_addr");
- conn = hci_conn_add(hdev, LE_LINK, dst, HCI_ROLE_MASTER);
+ conn = hci_conn_add(hdev, LE_LINK, dst, HCI_ROLE_CENTRAL);
if (!conn)
return ERR_PTR(-ENOMEM);
@@ -1300,7 +1300,7 @@ struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,
acl = hci_conn_hash_lookup_ba(hdev, ACL_LINK, dst);
if (!acl) {
- acl = hci_conn_add(hdev, ACL_LINK, dst, HCI_ROLE_MASTER);
+ acl = hci_conn_add(hdev, ACL_LINK, dst, HCI_ROLE_CENTRAL);
if (!acl)
return ERR_PTR(-ENOMEM);
}
@@ -1331,7 +1331,7 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst,
sco = hci_conn_hash_lookup_ba(hdev, type, dst);
if (!sco) {
- sco = hci_conn_add(hdev, type, dst, HCI_ROLE_MASTER);
+ sco = hci_conn_add(hdev, type, dst, HCI_ROLE_CENTRAL);
if (!sco) {
hci_conn_drop(acl);
return ERR_PTR(-ENOMEM);
@@ -1630,8 +1630,8 @@ static u32 get_link_mode(struct hci_conn *conn)
{
u32 link_mode = 0;
- if (conn->role == HCI_ROLE_MASTER)
- link_mode |= HCI_LM_MASTER;
+ if (conn->role == HCI_ROLE_CENTRAL)
+ link_mode |= HCI_LM_CENTRAL;
if (test_bit(HCI_CONN_ENCRYPT, &conn->flags))
link_mode |= HCI_LM_ENCRYPT;
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 6eedf334f943..4ac6022f7085 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2069,7 +2069,7 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
case HCISETLINKMODE:
hdev->link_mode = ((__u16) dr.dev_opt) &
- (HCI_LM_MASTER | HCI_LM_ACCEPT);
+ (HCI_LM_CENTRAL | HCI_LM_ACCEPT);
break;
case HCISETPTYPE:
@@ -2465,9 +2465,9 @@ static bool hci_persistent_key(struct hci_dev *hdev, struct hci_conn *conn,
static u8 ltk_role(u8 type)
{
if (type == SMP_LTK)
- return HCI_ROLE_MASTER;
+ return HCI_ROLE_CENTRAL;
- return HCI_ROLE_SLAVE;
+ return HCI_ROLE_PERIPHERAL;
}
struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index cde6a43cc61d..e5f3840abd1a 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1900,7 +1900,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
} else {
if (!conn) {
conn = hci_conn_add(hdev, ACL_LINK, &cp->bdaddr,
- HCI_ROLE_MASTER);
+ HCI_ROLE_CENTRAL);
if (!conn)
bt_dev_err(hdev, "no memory for new connection");
}
@@ -2627,7 +2627,7 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
&ev->bdaddr,
BDADDR_BREDR)) {
conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr,
- HCI_ROLE_SLAVE);
+ HCI_ROLE_PERIPHERAL);
if (!conn) {
bt_dev_err(hdev, "no memory for new conn");
goto unlock;
@@ -2775,7 +2775,7 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
&ev->bdaddr);
if (!conn) {
conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr,
- HCI_ROLE_SLAVE);
+ HCI_ROLE_PERIPHERAL);
if (!conn) {
bt_dev_err(hdev, "no memory for new connection");
hci_dev_unlock(hdev);
@@ -2794,10 +2794,10 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
bacpy(&cp.bdaddr, &ev->bdaddr);
- if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_MASTER))
- cp.role = 0x00; /* Become master */
+ if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_CENTRAL))
+ cp.role = 0x00; /* Become central */
else
- cp.role = 0x01; /* Remain slave */
+ cp.role = 0x01; /* Remain peripheral */
hci_send_cmd(hdev, HCI_OP_ACCEPT_CONN_REQ, sizeof(cp), &cp);
} else if (!(flags & HCI_PROTO_DEFER)) {
@@ -5131,7 +5131,7 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,
conn->dst_type = bdaddr_type;
/* 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
* connections are not "first class citizens" we don't
* have full tracking of them. Therefore, we go ahead
@@ -5423,8 +5423,8 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,
}
conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW,
- hdev->def_le_autoconnect_timeout, HCI_ROLE_MASTER,
- direct_rpa);
+ hdev->def_le_autoconnect_timeout,
+ HCI_ROLE_CENTRAL, direct_rpa);
if (!IS_ERR(conn)) {
/* If HCI_AUTO_CONN_EXPLICIT is set, conn is already owned
* by higher layer that tried to connect, if no then
@@ -5897,7 +5897,7 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev,
return send_conn_param_neg_reply(hdev, handle,
HCI_ERROR_INVALID_LL_PARAMS);
- if (hcon->role == HCI_ROLE_MASTER) {
+ if (hcon->role == HCI_ROLE_CENTRAL) {
struct hci_conn_params *params;
u8 store_hint;
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 9ebb85df4db4..c10a45368ec2 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1691,12 +1691,12 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
if (hcon->out)
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
* been configured for this connection. If not, then trigger
* the connection update procedure.
*/
- if (hcon->role == HCI_ROLE_SLAVE &&
+ if (hcon->role == HCI_ROLE_PERIPHERAL &&
(hcon->le_conn_interval < hcon->le_conn_min_interval ||
hcon->le_conn_interval > hcon->le_conn_max_interval)) {
struct l2cap_conn_param_update_req req;
@@ -5537,7 +5537,7 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn,
u16 min, max, latency, to_multiplier;
int err;
- if (hcon->role != HCI_ROLE_MASTER)
+ if (hcon->role != HCI_ROLE_CENTRAL)
return -EINVAL;
if (cmd_len != sizeof(struct l2cap_conn_param_update_req))
@@ -7905,7 +7905,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
hcon = hci_connect_le(hdev, dst, dst_type,
chan->sec_level,
HCI_LE_CONN_TIMEOUT,
- HCI_ROLE_SLAVE, NULL);
+ HCI_ROLE_PERIPHERAL, NULL);
else
hcon = hci_connect_le_scan(hdev, dst, dst_type,
chan->sec_level,
@@ -8046,12 +8046,12 @@ int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr)
if (!bacmp(&c->src, &hdev->bdaddr)) {
lm1 |= HCI_LM_ACCEPT;
if (test_bit(FLAG_ROLE_SWITCH, &c->flags))
- lm1 |= HCI_LM_MASTER;
+ lm1 |= HCI_LM_CENTRAL;
exact++;
} else if (!bacmp(&c->src, BDADDR_ANY)) {
lm2 |= HCI_LM_ACCEPT;
if (test_bit(FLAG_ROLE_SWITCH, &c->flags))
- lm2 |= HCI_LM_MASTER;
+ lm2 |= HCI_LM_CENTRAL;
}
}
read_unlock(&chan_list_lock);
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 372e3b25aaa4..54242711aa67 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -909,11 +909,11 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
hcon->pending_sec_level = BT_SECURITY_HIGH;
}
- /* If both devices have Keyoard-Display I/O, the master
- * Confirms and the slave Enters the passkey.
+ /* If both devices have Keyboard-Display I/O, the central
+ * Confirms and the peripheral Enters the passkey.
*/
if (smp->method == OVERLAP) {
- if (hcon->role == HCI_ROLE_MASTER)
+ if (hcon->role == HCI_ROLE_CENTRAL)
smp->method = CFM_PASSKEY;
else
smp->method = REQ_PASSKEY;
@@ -1741,7 +1741,7 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)
if (skb->len < sizeof(*req))
return SMP_INVALID_PARAMS;
- if (conn->hcon->role != HCI_ROLE_SLAVE)
+ if (conn->hcon->role != HCI_ROLE_PERIPHERAL)
return SMP_CMD_NOTSUPP;
if (!chan->data)
@@ -1932,7 +1932,7 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)
if (skb->len < sizeof(*rsp))
return SMP_INVALID_PARAMS;
- if (conn->hcon->role != HCI_ROLE_MASTER)
+ if (conn->hcon->role != HCI_ROLE_CENTRAL)
return SMP_CMD_NOTSUPP;
skb_pull(skb, sizeof(*rsp));
@@ -2294,7 +2294,7 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)
if (skb->len < sizeof(*rp))
return SMP_INVALID_PARAMS;
- if (hcon->role != HCI_ROLE_MASTER)
+ if (hcon->role != HCI_ROLE_CENTRAL)
return SMP_CMD_NOTSUPP;
auth = rp->auth_req & AUTH_REQ_MASK(hdev);
@@ -2368,7 +2368,7 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)
if (sec_level > hcon->pending_sec_level)
hcon->pending_sec_level = sec_level;
- if (hcon->role == HCI_ROLE_MASTER)
+ if (hcon->role == HCI_ROLE_CENTRAL)
if (smp_ltk_encrypt(conn, hcon->pending_sec_level))
return 0;
@@ -2412,7 +2412,7 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)
authreq |= SMP_AUTH_MITM;
}
- if (hcon->role == HCI_ROLE_MASTER) {
+ if (hcon->role == HCI_ROLE_CENTRAL) {
struct smp_cmd_pairing cp;
build_pairing_cmd(conn, &cp, NULL, authreq);
@@ -3081,8 +3081,8 @@ static void bredr_pairing(struct l2cap_chan *chan)
if (!test_bit(HCI_CONN_ENCRYPT, &hcon->flags))
return;
- /* Only master may initiate SMP over BR/EDR */
- if (hcon->role != HCI_ROLE_MASTER)
+ /* Only central may initiate SMP over BR/EDR */
+ if (hcon->role != HCI_ROLE_CENTRAL)
return;
/* Secure Connections support must be enabled */
--
2.32.0.rc0.204.g9fa02ecfa5-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v2 1/8] Bluetooth: use inclusive language in HCI role
2021-05-31 8:37 ` [PATCH v2 1/8] Bluetooth: use inclusive language in HCI role Archie Pusaka
@ 2021-06-02 19:55 ` Marcel Holtmann
0 siblings, 0 replies; 12+ messages in thread
From: Marcel Holtmann @ 2021-06-02 19:55 UTC (permalink / raw)
To: Archie Pusaka
Cc: linux-bluetooth, CrosBT Upstreaming, Archie Pusaka,
Miao-chen Chou, David S. Miller, Jakub Kicinski, Johan Hedberg,
Luiz Augusto von Dentz, open list, netdev
Hi Archie,
> 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>
>
> ---
>
> Changes in v2:
> * Add details in commit message
>
> include/net/bluetooth/hci.h | 6 +++---
> include/net/bluetooth/hci_core.h | 4 ++--
> net/bluetooth/amp.c | 2 +-
> net/bluetooth/hci_conn.c | 30 +++++++++++++++---------------
> net/bluetooth/hci_core.c | 6 +++---
> net/bluetooth/hci_event.c | 20 ++++++++++----------
> net/bluetooth/l2cap_core.c | 12 ++++++------
> net/bluetooth/smp.c | 20 ++++++++++----------
> 8 files changed, 50 insertions(+), 50 deletions(-)
>
> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
> index c4b0650fb9ae..18742f4471ff 100644
> --- a/include/net/bluetooth/hci.h
> +++ b/include/net/bluetooth/hci.h
> @@ -515,7 +515,7 @@ enum {
>
> /* Link modes */
> #define HCI_LM_ACCEPT 0x8000
> -#define HCI_LM_MASTER 0x0001
> +#define HCI_LM_CENTRAL 0x0001
> #define HCI_LM_AUTH 0x0002
> #define HCI_LM_ENCRYPT 0x0004
> #define HCI_LM_TRUSTED 0x0008
this is my fault since I overlooked this one. This is also API. Lets skip this for now.
Regards
Marcel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 2/8] Bluetooth: use inclusive language in hci_core.h
2021-05-31 8:37 [PATCH v2 0/8] Bluetooth: use inclusive language Archie Pusaka
2021-05-31 8:37 ` [PATCH v2 1/8] Bluetooth: use inclusive language in HCI role Archie Pusaka
@ 2021-05-31 8:37 ` Archie Pusaka
2021-05-31 8:37 ` [PATCH v2 3/8] Bluetooth: use inclusive language to describe CPB Archie Pusaka
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Archie Pusaka @ 2021-05-31 8:37 UTC (permalink / raw)
To: linux-bluetooth, Marcel Holtmann
Cc: CrosBT Upstreaming, Archie Pusaka, Miao-chen Chou,
David S. Miller, Jakub Kicinski, Johan Hedberg,
Luiz Augusto von Dentz, linux-kernel, netdev
From: Archie Pusaka <apusaka@chromium.org>
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
These attributes are not used elsewhere in the code.
Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
Changes in v2:
* Add details in commit message
include/net/bluetooth/hci.h | 44 ++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 18742f4471ff..c3efef266d6d 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1839,23 +1839,23 @@ struct hci_rp_le_read_iso_tx_sync {
#define HCI_OP_LE_SET_CIG_PARAMS 0x2062
struct hci_cis_params {
__u8 cis_id;
- __le16 m_sdu;
- __le16 s_sdu;
- __u8 m_phy;
- __u8 s_phy;
- __u8 m_rtn;
- __u8 s_rtn;
+ __le16 c_sdu;
+ __le16 p_pdu;
+ __u8 c_phy;
+ __u8 p_phy;
+ __u8 c_rtn;
+ __u8 p_rtn;
} __packed;
struct hci_cp_le_set_cig_params {
__u8 cig_id;
- __u8 m_interval[3];
- __u8 s_interval[3];
- __u8 sca;
+ __u8 c_interval[3];
+ __u8 p_interval[3];
+ __u8 wc_sca;
__u8 packing;
__u8 framing;
- __le16 m_latency;
- __le16 s_latency;
+ __le16 c_latency;
+ __le16 p_latency;
__u8 num_cis;
struct hci_cis_params cis[];
} __packed;
@@ -2260,7 +2260,7 @@ struct hci_ev_sync_train_complete {
__u8 status;
} __packed;
-#define HCI_EV_SLAVE_PAGE_RESP_TIMEOUT 0x54
+#define HCI_EV_PERIPHERAL_PAGE_RESP_TIMEOUT 0x54
#define HCI_EV_LE_CONN_COMPLETE 0x01
struct hci_ev_le_conn_complete {
@@ -2418,17 +2418,17 @@ struct hci_evt_le_cis_established {
__le16 handle;
__u8 cig_sync_delay[3];
__u8 cis_sync_delay[3];
- __u8 m_latency[3];
- __u8 s_latency[3];
- __u8 m_phy;
- __u8 s_phy;
+ __u8 c_latency[3];
+ __u8 p_latency[3];
+ __u8 c_phy;
+ __u8 p_phy;
__u8 nse;
- __u8 m_bn;
- __u8 s_bn;
- __u8 m_ft;
- __u8 s_ft;
- __le16 m_mtu;
- __le16 s_mtu;
+ __u8 c_bn;
+ __u8 p_bn;
+ __u8 c_ft;
+ __u8 p_ft;
+ __le16 c_mtu;
+ __le16 p_mtu;
__le16 interval;
} __packed;
--
2.32.0.rc0.204.g9fa02ecfa5-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 3/8] Bluetooth: use inclusive language to describe CPB
2021-05-31 8:37 [PATCH v2 0/8] Bluetooth: use inclusive language Archie Pusaka
2021-05-31 8:37 ` [PATCH v2 1/8] Bluetooth: use inclusive language in HCI role Archie Pusaka
2021-05-31 8:37 ` [PATCH v2 2/8] Bluetooth: use inclusive language in hci_core.h Archie Pusaka
@ 2021-05-31 8:37 ` Archie Pusaka
2021-05-31 8:37 ` [PATCH v2 4/8] Bluetooth: use inclusive language in HCI LE features Archie Pusaka
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Archie Pusaka @ 2021-05-31 8:37 UTC (permalink / raw)
To: linux-bluetooth, Marcel Holtmann
Cc: CrosBT Upstreaming, Archie Pusaka, Miao-chen Chou,
David S. Miller, Jakub Kicinski, Johan Hedberg,
Luiz Augusto von Dentz, linux-kernel, netdev
From: Archie Pusaka <apusaka@chromium.org>
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 when describing the
connectionless peripheral broadcast feature:
master -> central
slave -> peripheral
Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
Changes in v2:
* Add details in commit message
include/net/bluetooth/hci.h | 26 +++++++++++++-------------
include/net/bluetooth/hci_core.h | 4 ++--
net/bluetooth/hci_conn.c | 2 +-
net/bluetooth/hci_core.c | 16 ++++++++--------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index c3efef266d6d..a7cf5a2d87c5 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -36,7 +36,7 @@
#define HCI_MAX_AMP_ASSOC_SIZE 672
-#define HCI_MAX_CSB_DATA_SIZE 252
+#define HCI_MAX_CPB_DATA_SIZE 252
/* HCI dev events */
#define HCI_DEV_REG 1
@@ -472,10 +472,10 @@ enum {
#define LMP_EXTFEATURES 0x80
/* Extended LMP features */
-#define LMP_CSB_MASTER 0x01
-#define LMP_CSB_SLAVE 0x02
-#define LMP_SYNC_TRAIN 0x04
-#define LMP_SYNC_SCAN 0x08
+#define LMP_CPB_CENTRAL 0x01
+#define LMP_CPB_PERIPHERAL 0x02
+#define LMP_SYNC_TRAIN 0x04
+#define LMP_SYNC_SCAN 0x08
#define LMP_SC 0x01
#define LMP_PING 0x02
@@ -877,17 +877,17 @@ struct hci_rp_logical_link_cancel {
__u8 flow_spec_id;
} __packed;
-#define HCI_OP_SET_CSB 0x0441
-struct hci_cp_set_csb {
+#define HCI_OP_SET_CPB 0x0441
+struct hci_cp_set_cpb {
__u8 enable;
__u8 lt_addr;
__u8 lpo_allowed;
__le16 packet_type;
__le16 interval_min;
__le16 interval_max;
- __le16 csb_sv_tout;
+ __le16 cpb_sv_tout;
} __packed;
-struct hci_rp_set_csb {
+struct hci_rp_set_cpb {
__u8 status;
__u8 lt_addr;
__le16 interval;
@@ -1184,14 +1184,14 @@ struct hci_rp_delete_reserved_lt_addr {
__u8 lt_addr;
} __packed;
-#define HCI_OP_SET_CSB_DATA 0x0c76
-struct hci_cp_set_csb_data {
+#define HCI_OP_SET_CPB_DATA 0x0c76
+struct hci_cp_set_cpb_data {
__u8 lt_addr;
__u8 fragment;
__u8 data_length;
- __u8 data[HCI_MAX_CSB_DATA_SIZE];
+ __u8 data[HCI_MAX_CPB_DATA_SIZE];
} __packed;
-struct hci_rp_set_csb_data {
+struct hci_rp_set_cpb_data {
__u8 status;
__u8 lt_addr;
} __packed;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 368e16fdf441..929768f6ed93 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1394,8 +1394,8 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
#define lmp_edr_5slot_capable(dev) ((dev)->features[0][5] & LMP_EDR_5SLOT)
/* ----- Extended LMP capabilities ----- */
-#define lmp_csb_master_capable(dev) ((dev)->features[2][0] & LMP_CSB_MASTER)
-#define lmp_csb_slave_capable(dev) ((dev)->features[2][0] & LMP_CSB_SLAVE)
+#define lmp_cpb_central_capable(dev) ((dev)->features[2][0] & LMP_CPB_CENTRAL)
+#define lmp_cpb_peripheral_capable(dev) ((dev)->features[2][0] & LMP_CPB_PERIPHERAL)
#define lmp_sync_train_capable(dev) ((dev)->features[2][0] & LMP_SYNC_TRAIN)
#define lmp_sync_scan_capable(dev) ((dev)->features[2][0] & LMP_SYNC_SCAN)
#define lmp_sc_capable(dev) ((dev)->features[2][1] & LMP_SC)
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 703470b6b924..7b8784d4da96 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1842,7 +1842,7 @@ u32 hci_conn_get_phy(struct hci_conn *conn)
/* BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 2, Part B page 471:
* Table 6.2: Packets defined for synchronous, asynchronous, and
- * CSB logical transport types.
+ * CPB logical transport types.
*/
switch (conn->type) {
case SCO_LINK:
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 4ac6022f7085..b9ebad0f8fb9 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -545,24 +545,24 @@ static void hci_set_event_mask_page_2(struct hci_request *req)
u8 events[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
bool changed = false;
- /* If Connectionless Slave Broadcast master role is supported
+ /* If Connectionless Peripheral Broadcast central role is supported
* enable all necessary events for it.
*/
- if (lmp_csb_master_capable(hdev)) {
+ if (lmp_cpb_central_capable(hdev)) {
events[1] |= 0x40; /* Triggered Clock Capture */
events[1] |= 0x80; /* Synchronization Train Complete */
- events[2] |= 0x10; /* Slave Page Response Timeout */
- events[2] |= 0x20; /* CSB Channel Map Change */
+ events[2] |= 0x10; /* Peripheral Page Response Timeout */
+ events[2] |= 0x20; /* CPB Channel Map Change */
changed = true;
}
- /* If Connectionless Slave Broadcast slave role is supported
+ /* If Connectionless Peripheral Broadcast peripheral role is supported
* enable all necessary events for it.
*/
- if (lmp_csb_slave_capable(hdev)) {
+ if (lmp_cpb_peripheral_capable(hdev)) {
events[2] |= 0x01; /* Synchronization Train Received */
- events[2] |= 0x02; /* CSB Receive */
- events[2] |= 0x04; /* CSB Timeout */
+ events[2] |= 0x02; /* CPB Receive */
+ events[2] |= 0x04; /* CPB Timeout */
events[2] |= 0x08; /* Truncated Page Complete */
changed = true;
}
--
2.32.0.rc0.204.g9fa02ecfa5-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 4/8] Bluetooth: use inclusive language in HCI LE features
2021-05-31 8:37 [PATCH v2 0/8] Bluetooth: use inclusive language Archie Pusaka
` (2 preceding siblings ...)
2021-05-31 8:37 ` [PATCH v2 3/8] Bluetooth: use inclusive language to describe CPB Archie Pusaka
@ 2021-05-31 8:37 ` Archie Pusaka
2021-05-31 8:37 ` [PATCH v2 5/8] Bluetooth: use inclusive language when tracking connections Archie Pusaka
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Archie Pusaka @ 2021-05-31 8:37 UTC (permalink / raw)
To: linux-bluetooth, Marcel Holtmann
Cc: CrosBT Upstreaming, Archie Pusaka, Miao-chen Chou,
David S. Miller, Jakub Kicinski, Johan Hedberg,
Luiz Augusto von Dentz, linux-kernel, netdev
From: Archie Pusaka <apusaka@chromium.org>
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>
---
Changes in v2:
* Add details in commit message
include/net/bluetooth/hci.h | 6 +++---
net/bluetooth/hci_event.c | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index a7cf5a2d87c5..441125f6b616 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -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
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index e5f3840abd1a..a809e90326d7 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -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;
--
2.32.0.rc0.204.g9fa02ecfa5-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 5/8] Bluetooth: use inclusive language when tracking connections
2021-05-31 8:37 [PATCH v2 0/8] Bluetooth: use inclusive language Archie Pusaka
` (3 preceding siblings ...)
2021-05-31 8:37 ` [PATCH v2 4/8] Bluetooth: use inclusive language in HCI LE features Archie Pusaka
@ 2021-05-31 8:37 ` Archie Pusaka
2021-05-31 8:37 ` [PATCH v2 6/8] Bluetooth: use inclusive language in SMP Archie Pusaka
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Archie Pusaka @ 2021-05-31 8:37 UTC (permalink / raw)
To: linux-bluetooth, Marcel Holtmann
Cc: CrosBT Upstreaming, Archie Pusaka, Miao-chen Chou,
David S. Miller, Jakub Kicinski, Johan Hedberg,
Luiz Augusto von Dentz, linux-kernel, netdev
From: Archie Pusaka <apusaka@chromium.org>
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>
---
Changes in v2:
* Add details in commit message
include/net/bluetooth/hci_core.h | 6 +++---
net/bluetooth/hci_event.c | 4 ++--
net/bluetooth/hci_request.c | 17 +++++++++--------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 929768f6ed93..cfe2ada49ca2 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -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_PERIPHERAL)
- 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_PERIPHERAL)
- h->le_num_slave--;
+ h->le_num_peripheral--;
break;
case SCO_LINK:
case ESCO_LINK:
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index a809e90326d7..c5871c2a16ba 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;
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index 3465862429fb..a5d55175176e 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -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) ||
--
2.32.0.rc0.204.g9fa02ecfa5-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 6/8] Bluetooth: use inclusive language in SMP
2021-05-31 8:37 [PATCH v2 0/8] Bluetooth: use inclusive language Archie Pusaka
` (4 preceding siblings ...)
2021-05-31 8:37 ` [PATCH v2 5/8] Bluetooth: use inclusive language when tracking connections Archie Pusaka
@ 2021-05-31 8:37 ` Archie Pusaka
2021-05-31 8:37 ` [PATCH v2 7/8] Bluetooth: use inclusive language when filtering devices Archie Pusaka
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Archie Pusaka @ 2021-05-31 8:37 UTC (permalink / raw)
To: linux-bluetooth, Marcel Holtmann
Cc: CrosBT Upstreaming, Archie Pusaka, David S. Miller,
Jakub Kicinski, Johan Hedberg, Luiz Augusto von Dentz,
linux-kernel, netdev
From: Archie Pusaka <apusaka@chromium.org>
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
slave -> responder
Signed-off-by: Archie Pusaka <apusaka@chromium.org>
---
Changes in v2:
* Add details in commit message
* Use initiator/responder instead of central/peripheral
include/net/bluetooth/mgmt.h | 2 +-
net/bluetooth/mgmt.c | 10 +++---
net/bluetooth/smp.c | 66 +++++++++++++++++++-----------------
net/bluetooth/smp.h | 6 ++--
4 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index a03c62b1dc2f..23a0524061b7 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -202,7 +202,7 @@ struct mgmt_cp_load_link_keys {
struct mgmt_ltk_info {
struct mgmt_addr_info addr;
__u8 type;
- __u8 master;
+ __u8 initiator;
__u8 enc_size;
__le16 ediv;
__le64 rand;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 91d36c3bf23e..6adee6de1e03 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -6169,7 +6169,7 @@ static int load_irks(struct sock *sk, struct hci_dev *hdev, void *cp_data,
static bool ltk_is_valid(struct mgmt_ltk_info *key)
{
- if (key->master != 0x00 && key->master != 0x01)
+ if (key->initiator != 0x00 && key->initiator != 0x01)
return false;
switch (key->addr.type) {
@@ -6247,11 +6247,11 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,
switch (key->type) {
case MGMT_LTK_UNAUTHENTICATED:
authenticated = 0x00;
- type = key->master ? SMP_LTK : SMP_LTK_SLAVE;
+ type = key->initiator ? SMP_LTK : SMP_LTK_RESPONDER;
break;
case MGMT_LTK_AUTHENTICATED:
authenticated = 0x01;
- type = key->master ? SMP_LTK : SMP_LTK_SLAVE;
+ type = key->initiator ? SMP_LTK : SMP_LTK_RESPONDER;
break;
case MGMT_LTK_P256_UNAUTH:
authenticated = 0x00;
@@ -8646,7 +8646,7 @@ static u8 mgmt_ltk_type(struct smp_ltk *ltk)
{
switch (ltk->type) {
case SMP_LTK:
- case SMP_LTK_SLAVE:
+ case SMP_LTK_RESPONDER:
if (ltk->authenticated)
return MGMT_LTK_AUTHENTICATED;
return MGMT_LTK_UNAUTHENTICATED;
@@ -8692,7 +8692,7 @@ void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, bool persistent)
ev.key.rand = key->rand;
if (key->type == SMP_LTK)
- ev.key.master = 1;
+ ev.key.initiator = 1;
/* Make sure we copy only the significant bytes based on the
* encryption key size, and set the rest of the value to zeroes.
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 54242711aa67..f357bc6e5366 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -111,9 +111,9 @@ struct smp_chan {
u8 id_addr_type;
u8 irk[16];
struct smp_csrk *csrk;
- struct smp_csrk *slave_csrk;
+ struct smp_csrk *responder_csrk;
struct smp_ltk *ltk;
- struct smp_ltk *slave_ltk;
+ struct smp_ltk *responder_ltk;
struct smp_irk *remote_irk;
u8 *link_key;
unsigned long flags;
@@ -753,7 +753,7 @@ static void smp_chan_destroy(struct l2cap_conn *conn)
mgmt_smp_complete(hcon, complete);
kfree_sensitive(smp->csrk);
- kfree_sensitive(smp->slave_csrk);
+ kfree_sensitive(smp->responder_csrk);
kfree_sensitive(smp->link_key);
crypto_free_shash(smp->tfm_cmac);
@@ -776,9 +776,9 @@ static void smp_chan_destroy(struct l2cap_conn *conn)
kfree_rcu(smp->ltk, rcu);
}
- if (smp->slave_ltk) {
- list_del_rcu(&smp->slave_ltk->list);
- kfree_rcu(smp->slave_ltk, rcu);
+ if (smp->responder_ltk) {
+ list_del_rcu(&smp->responder_ltk->list);
+ kfree_rcu(smp->responder_ltk, rcu);
}
if (smp->remote_irk) {
@@ -979,7 +979,7 @@ static u8 smp_random(struct smp_chan *smp)
int ret;
bt_dev_dbg(conn->hcon->hdev, "conn %p %s", conn,
- conn->hcon->out ? "master" : "slave");
+ conn->hcon->out ? "initiator" : "responder");
ret = smp_c1(smp->tk, smp->rrnd, smp->preq, smp->prsp,
hcon->init_addr_type, &hcon->init_addr,
@@ -1021,8 +1021,8 @@ static u8 smp_random(struct smp_chan *smp)
else
auth = 0;
- /* Even though there's no _SLAVE suffix this is the
- * slave STK we're adding for later lookup (the master
+ /* Even though there's no _RESPONDER suffix this is the
+ * responder STK we're adding for later lookup (the initiator
* STK never needs to be stored).
*/
hci_add_ltk(hcon->hdev, &hcon->dst, hcon->dst_type,
@@ -1077,10 +1077,10 @@ static void smp_notify_keys(struct l2cap_conn *conn)
mgmt_new_csrk(hdev, smp->csrk, persistent);
}
- if (smp->slave_csrk) {
- smp->slave_csrk->bdaddr_type = hcon->dst_type;
- bacpy(&smp->slave_csrk->bdaddr, &hcon->dst);
- mgmt_new_csrk(hdev, smp->slave_csrk, persistent);
+ if (smp->responder_csrk) {
+ smp->responder_csrk->bdaddr_type = hcon->dst_type;
+ bacpy(&smp->responder_csrk->bdaddr, &hcon->dst);
+ mgmt_new_csrk(hdev, smp->responder_csrk, persistent);
}
if (smp->ltk) {
@@ -1089,10 +1089,10 @@ static void smp_notify_keys(struct l2cap_conn *conn)
mgmt_new_ltk(hdev, smp->ltk, persistent);
}
- if (smp->slave_ltk) {
- smp->slave_ltk->bdaddr_type = hcon->dst_type;
- bacpy(&smp->slave_ltk->bdaddr, &hcon->dst);
- mgmt_new_ltk(hdev, smp->slave_ltk, persistent);
+ if (smp->responder_ltk) {
+ smp->responder_ltk->bdaddr_type = hcon->dst_type;
+ bacpy(&smp->responder_ltk->bdaddr, &hcon->dst);
+ mgmt_new_ltk(hdev, smp->responder_ltk, persistent);
}
if (smp->link_key) {
@@ -1272,7 +1272,7 @@ static void smp_distribute_keys(struct smp_chan *smp)
if (*keydist & SMP_DIST_ENC_KEY) {
struct smp_cmd_encrypt_info enc;
- struct smp_cmd_master_ident ident;
+ struct smp_cmd_initiator_ident ident;
struct smp_ltk *ltk;
u8 authenticated;
__le16 ediv;
@@ -1293,14 +1293,15 @@ static void smp_distribute_keys(struct smp_chan *smp)
authenticated = hcon->sec_level == BT_SECURITY_HIGH;
ltk = hci_add_ltk(hdev, &hcon->dst, hcon->dst_type,
- SMP_LTK_SLAVE, authenticated, enc.ltk,
+ SMP_LTK_RESPONDER, authenticated, enc.ltk,
smp->enc_key_size, ediv, rand);
- smp->slave_ltk = ltk;
+ smp->responder_ltk = ltk;
ident.ediv = ediv;
ident.rand = rand;
- smp_send_cmd(conn, SMP_CMD_MASTER_IDENT, sizeof(ident), &ident);
+ smp_send_cmd(conn, SMP_CMD_INITIATOR_IDENT, sizeof(ident),
+ &ident);
*keydist &= ~SMP_DIST_ENC_KEY;
}
@@ -1343,7 +1344,7 @@ static void smp_distribute_keys(struct smp_chan *smp)
csrk->type = MGMT_CSRK_LOCAL_UNAUTHENTICATED;
memcpy(csrk->val, sign.csrk, sizeof(csrk->val));
}
- smp->slave_csrk = csrk;
+ smp->responder_csrk = csrk;
smp_send_cmd(conn, SMP_CMD_SIGN_INFO, sizeof(sign), &sign);
@@ -2048,7 +2049,7 @@ static int fixup_sc_false_positive(struct smp_chan *smp)
struct smp_cmd_pairing *req, *rsp;
u8 auth;
- /* The issue is only observed when we're in slave role */
+ /* The issue is only observed when we're in responder role */
if (hcon->out)
return SMP_UNSPECIFIED;
@@ -2084,7 +2085,8 @@ static u8 smp_cmd_pairing_confirm(struct l2cap_conn *conn, struct sk_buff *skb)
struct hci_conn *hcon = conn->hcon;
struct hci_dev *hdev = hcon->hdev;
- bt_dev_dbg(hdev, "conn %p %s", conn, hcon->out ? "master" : "slave");
+ bt_dev_dbg(hdev, "conn %p %s", conn,
+ hcon->out ? "initiator" : "responder");
if (skb->len < sizeof(smp->pcnf))
return SMP_INVALID_PARAMS;
@@ -2251,7 +2253,7 @@ static bool smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level)
hci_le_start_enc(hcon, key->ediv, key->rand, key->val, key->enc_size);
hcon->enc_key_size = key->enc_size;
- /* We never store STKs for master role, so clear this flag */
+ /* We never store STKs for initiator role, so clear this flag */
clear_bit(HCI_CONN_STK_ENCRYPT, &hcon->flags);
return true;
@@ -2467,7 +2469,7 @@ int smp_cancel_and_remove_pairing(struct hci_dev *hdev, bdaddr_t *bdaddr,
/* Set keys to NULL to make sure smp_failure() does not try to
* remove and free already invalidated rcu list entries. */
smp->ltk = NULL;
- smp->slave_ltk = NULL;
+ smp->responder_ltk = NULL;
smp->remote_irk = NULL;
if (test_bit(SMP_FLAG_COMPLETE, &smp->flags))
@@ -2503,7 +2505,7 @@ static int smp_cmd_encrypt_info(struct l2cap_conn *conn, struct sk_buff *skb)
return SMP_INVALID_PARAMS;
}
- SMP_ALLOW_CMD(smp, SMP_CMD_MASTER_IDENT);
+ SMP_ALLOW_CMD(smp, SMP_CMD_INITIATOR_IDENT);
skb_pull(skb, sizeof(*rp));
@@ -2512,9 +2514,9 @@ static int smp_cmd_encrypt_info(struct l2cap_conn *conn, struct sk_buff *skb)
return 0;
}
-static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)
+static int smp_cmd_initiator_ident(struct l2cap_conn *conn, struct sk_buff *skb)
{
- struct smp_cmd_master_ident *rp = (void *) skb->data;
+ struct smp_cmd_initiator_ident *rp = (void *)skb->data;
struct l2cap_chan *chan = conn->smp;
struct smp_chan *smp = chan->data;
struct hci_dev *hdev = conn->hcon->hdev;
@@ -2913,7 +2915,7 @@ static int smp_cmd_dhkey_check(struct l2cap_conn *conn, struct sk_buff *skb)
return 0;
}
- /* Slave sends DHKey check as response to master */
+ /* Responder sends DHKey check as response to initiator */
sc_dhkey_check(smp);
}
@@ -3000,8 +3002,8 @@ static int smp_sig_channel(struct l2cap_chan *chan, struct sk_buff *skb)
reason = smp_cmd_encrypt_info(conn, skb);
break;
- case SMP_CMD_MASTER_IDENT:
- reason = smp_cmd_master_ident(conn, skb);
+ case SMP_CMD_INITIATOR_IDENT:
+ reason = smp_cmd_initiator_ident(conn, skb);
break;
case SMP_CMD_IDENT_INFO:
diff --git a/net/bluetooth/smp.h b/net/bluetooth/smp.h
index fc35a8bf358e..87a59ec2c9f0 100644
--- a/net/bluetooth/smp.h
+++ b/net/bluetooth/smp.h
@@ -79,8 +79,8 @@ struct smp_cmd_encrypt_info {
__u8 ltk[16];
} __packed;
-#define SMP_CMD_MASTER_IDENT 0x07
-struct smp_cmd_master_ident {
+#define SMP_CMD_INITIATOR_IDENT 0x07
+struct smp_cmd_initiator_ident {
__le16 ediv;
__le64 rand;
} __packed;
@@ -146,7 +146,7 @@ struct smp_cmd_keypress_notify {
enum {
SMP_STK,
SMP_LTK,
- SMP_LTK_SLAVE,
+ SMP_LTK_RESPONDER,
SMP_LTK_P256,
SMP_LTK_P256_DEBUG,
};
--
2.32.0.rc0.204.g9fa02ecfa5-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 7/8] Bluetooth: use inclusive language when filtering devices
2021-05-31 8:37 [PATCH v2 0/8] Bluetooth: use inclusive language Archie Pusaka
` (5 preceding siblings ...)
2021-05-31 8:37 ` [PATCH v2 6/8] Bluetooth: use inclusive language in SMP Archie Pusaka
@ 2021-05-31 8:37 ` Archie Pusaka
2021-06-02 20:04 ` Marcel Holtmann
2021-05-31 8:37 ` [PATCH v2 8/8] Bluetooth: use inclusive language in comments Archie Pusaka
2021-06-02 20:04 ` [PATCH v2 0/8] Bluetooth: use inclusive language Marcel Holtmann
8 siblings, 1 reply; 12+ messages in thread
From: Archie Pusaka @ 2021-05-31 8:37 UTC (permalink / raw)
To: linux-bluetooth, Marcel Holtmann
Cc: CrosBT Upstreaming, Archie Pusaka, Miao-chen Chou,
David S. Miller, Jakub Kicinski, Johan Hedberg,
Luiz Augusto von Dentz, linux-kernel, netdev
From: Archie Pusaka <apusaka@chromium.org>
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:
blacklist -> reject list
whitelist -> accept list
Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
Changes in v2:
* Add details in commit message
* Was actually two patches, squashed together
include/net/bluetooth/hci.h | 16 +++---
include/net/bluetooth/hci_core.h | 8 +--
net/bluetooth/hci_core.c | 24 ++++-----
net/bluetooth/hci_debugfs.c | 8 +--
net/bluetooth/hci_event.c | 70 ++++++++++++-------------
net/bluetooth/hci_request.c | 89 ++++++++++++++++----------------
net/bluetooth/hci_sock.c | 12 ++---
net/bluetooth/l2cap_core.c | 4 +-
net/bluetooth/mgmt.c | 24 +++++----
9 files changed, 129 insertions(+), 126 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 441125f6b616..e6801ed7ad6e 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1505,7 +1505,7 @@ struct hci_cp_le_set_scan_enable {
} __packed;
#define HCI_LE_USE_PEER_ADDR 0x00
-#define HCI_LE_USE_WHITELIST 0x01
+#define HCI_LE_USE_ACCEPT_LIST 0x01
#define HCI_OP_LE_CREATE_CONN 0x200d
struct hci_cp_le_create_conn {
@@ -1525,22 +1525,22 @@ struct hci_cp_le_create_conn {
#define HCI_OP_LE_CREATE_CONN_CANCEL 0x200e
-#define HCI_OP_LE_READ_WHITE_LIST_SIZE 0x200f
-struct hci_rp_le_read_white_list_size {
+#define HCI_OP_LE_READ_ACCEPT_LIST_SIZE 0x200f
+struct hci_rp_le_read_accept_list_size {
__u8 status;
__u8 size;
} __packed;
-#define HCI_OP_LE_CLEAR_WHITE_LIST 0x2010
+#define HCI_OP_LE_CLEAR_ACCEPT_LIST 0x2010
-#define HCI_OP_LE_ADD_TO_WHITE_LIST 0x2011
-struct hci_cp_le_add_to_white_list {
+#define HCI_OP_LE_ADD_TO_ACCEPT_LIST 0x2011
+struct hci_cp_le_add_to_accept_list {
__u8 bdaddr_type;
bdaddr_t bdaddr;
} __packed;
-#define HCI_OP_LE_DEL_FROM_WHITE_LIST 0x2012
-struct hci_cp_le_del_from_white_list {
+#define HCI_OP_LE_DEL_FROM_ACCEPT_LIST 0x2012
+struct hci_cp_le_del_from_accept_list {
__u8 bdaddr_type;
bdaddr_t bdaddr;
} __packed;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index cfe2ada49ca2..163caeac46a5 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -327,7 +327,7 @@ struct hci_dev {
__u8 max_page;
__u8 features[HCI_MAX_PAGES][8];
__u8 le_features[8];
- __u8 le_white_list_size;
+ __u8 le_accept_list_size;
__u8 le_resolv_list_size;
__u8 le_num_of_adv_sets;
__u8 le_states[8];
@@ -522,14 +522,14 @@ struct hci_dev {
struct hci_conn_hash conn_hash;
struct list_head mgmt_pending;
- struct list_head blacklist;
- struct list_head whitelist;
+ struct list_head reject_list;
+ struct list_head accept_list;
struct list_head uuids;
struct list_head link_keys;
struct list_head long_term_keys;
struct list_head identity_resolving_keys;
struct list_head remote_oob_data;
- struct list_head le_white_list;
+ struct list_head le_accept_list;
struct list_head le_resolv_list;
struct list_head le_conn_params;
struct list_head pend_le_conns;
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index b9ebad0f8fb9..8cf1c0068d11 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -749,14 +749,14 @@ static int hci_init3_req(struct hci_request *req, unsigned long opt)
}
if (hdev->commands[26] & 0x40) {
- /* Read LE White List Size */
- hci_req_add(req, HCI_OP_LE_READ_WHITE_LIST_SIZE,
+ /* Read LE Accept List Size */
+ hci_req_add(req, HCI_OP_LE_READ_ACCEPT_LIST_SIZE,
0, NULL);
}
if (hdev->commands[26] & 0x80) {
- /* Clear LE White List */
- hci_req_add(req, HCI_OP_LE_CLEAR_WHITE_LIST, 0, NULL);
+ /* Clear LE Accept List */
+ hci_req_add(req, HCI_OP_LE_CLEAR_ACCEPT_LIST, 0, NULL);
}
if (hdev->commands[34] & 0x40) {
@@ -3708,13 +3708,13 @@ static int hci_suspend_notifier(struct notifier_block *nb, unsigned long action,
/* Suspend consists of two actions:
* - First, disconnect everything and make the controller not
* connectable (disabling scanning)
- * - Second, program event filter/whitelist and enable scan
+ * - Second, program event filter/accept list and enable scan
*/
ret = hci_change_suspend_state(hdev, BT_SUSPEND_DISCONNECT);
if (!ret)
state = BT_SUSPEND_DISCONNECT;
- /* Only configure whitelist if disconnect succeeded and wake
+ /* Only configure accept list if disconnect succeeded and wake
* isn't being prevented.
*/
if (!ret && !(hdev->prevent_wake && hdev->prevent_wake(hdev))) {
@@ -3822,14 +3822,14 @@ struct hci_dev *hci_alloc_dev(void)
mutex_init(&hdev->req_lock);
INIT_LIST_HEAD(&hdev->mgmt_pending);
- INIT_LIST_HEAD(&hdev->blacklist);
- INIT_LIST_HEAD(&hdev->whitelist);
+ INIT_LIST_HEAD(&hdev->reject_list);
+ INIT_LIST_HEAD(&hdev->accept_list);
INIT_LIST_HEAD(&hdev->uuids);
INIT_LIST_HEAD(&hdev->link_keys);
INIT_LIST_HEAD(&hdev->long_term_keys);
INIT_LIST_HEAD(&hdev->identity_resolving_keys);
INIT_LIST_HEAD(&hdev->remote_oob_data);
- INIT_LIST_HEAD(&hdev->le_white_list);
+ INIT_LIST_HEAD(&hdev->le_accept_list);
INIT_LIST_HEAD(&hdev->le_resolv_list);
INIT_LIST_HEAD(&hdev->le_conn_params);
INIT_LIST_HEAD(&hdev->pend_le_conns);
@@ -4042,8 +4042,8 @@ void hci_unregister_dev(struct hci_dev *hdev)
destroy_workqueue(hdev->req_workqueue);
hci_dev_lock(hdev);
- hci_bdaddr_list_clear(&hdev->blacklist);
- hci_bdaddr_list_clear(&hdev->whitelist);
+ hci_bdaddr_list_clear(&hdev->reject_list);
+ hci_bdaddr_list_clear(&hdev->accept_list);
hci_uuids_clear(hdev);
hci_link_keys_clear(hdev);
hci_smp_ltks_clear(hdev);
@@ -4051,7 +4051,7 @@ void hci_unregister_dev(struct hci_dev *hdev)
hci_remote_oob_data_clear(hdev);
hci_adv_instances_clear(hdev);
hci_adv_monitors_clear(hdev);
- hci_bdaddr_list_clear(&hdev->le_white_list);
+ hci_bdaddr_list_clear(&hdev->le_accept_list);
hci_bdaddr_list_clear(&hdev->le_resolv_list);
hci_conn_params_clear_all(hdev);
hci_discovery_filter_clear(hdev);
diff --git a/net/bluetooth/hci_debugfs.c b/net/bluetooth/hci_debugfs.c
index 47f4f21fbc1a..841393389f7b 100644
--- a/net/bluetooth/hci_debugfs.c
+++ b/net/bluetooth/hci_debugfs.c
@@ -125,7 +125,7 @@ static int device_list_show(struct seq_file *f, void *ptr)
struct bdaddr_list *b;
hci_dev_lock(hdev);
- list_for_each_entry(b, &hdev->whitelist, list)
+ list_for_each_entry(b, &hdev->accept_list, list)
seq_printf(f, "%pMR (type %u)\n", &b->bdaddr, b->bdaddr_type);
list_for_each_entry(p, &hdev->le_conn_params, list) {
seq_printf(f, "%pMR (type %u) %u\n", &p->addr, p->addr_type,
@@ -144,7 +144,7 @@ static int blacklist_show(struct seq_file *f, void *p)
struct bdaddr_list *b;
hci_dev_lock(hdev);
- list_for_each_entry(b, &hdev->blacklist, list)
+ list_for_each_entry(b, &hdev->reject_list, list)
seq_printf(f, "%pMR (type %u)\n", &b->bdaddr, b->bdaddr_type);
hci_dev_unlock(hdev);
@@ -784,7 +784,7 @@ static int white_list_show(struct seq_file *f, void *ptr)
struct bdaddr_list *b;
hci_dev_lock(hdev);
- list_for_each_entry(b, &hdev->le_white_list, list)
+ list_for_each_entry(b, &hdev->le_accept_list, list)
seq_printf(f, "%pMR (type %u)\n", &b->bdaddr, b->bdaddr_type);
hci_dev_unlock(hdev);
@@ -1195,7 +1195,7 @@ void hci_debugfs_create_le(struct hci_dev *hdev)
&force_static_address_fops);
debugfs_create_u8("white_list_size", 0444, hdev->debugfs,
- &hdev->le_white_list_size);
+ &hdev->le_accept_list_size);
debugfs_create_file("white_list", 0444, hdev->debugfs, hdev,
&white_list_fops);
debugfs_create_u8("resolv_list_size", 0444, hdev->debugfs,
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index c5871c2a16ba..760e8e14e0f2 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -236,7 +236,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
hdev->ssp_debug_mode = 0;
- hci_bdaddr_list_clear(&hdev->le_white_list);
+ hci_bdaddr_list_clear(&hdev->le_accept_list);
hci_bdaddr_list_clear(&hdev->le_resolv_list);
}
@@ -1492,21 +1492,21 @@ static void hci_cc_le_read_num_adv_sets(struct hci_dev *hdev,
hdev->le_num_of_adv_sets = rp->num_of_sets;
}
-static void hci_cc_le_read_white_list_size(struct hci_dev *hdev,
- struct sk_buff *skb)
+static void hci_cc_le_read_accept_list_size(struct hci_dev *hdev,
+ struct sk_buff *skb)
{
- struct hci_rp_le_read_white_list_size *rp = (void *) skb->data;
+ struct hci_rp_le_read_accept_list_size *rp = (void *)skb->data;
BT_DBG("%s status 0x%2.2x size %u", hdev->name, rp->status, rp->size);
if (rp->status)
return;
- hdev->le_white_list_size = rp->size;
+ hdev->le_accept_list_size = rp->size;
}
-static void hci_cc_le_clear_white_list(struct hci_dev *hdev,
- struct sk_buff *skb)
+static void hci_cc_le_clear_accept_list(struct hci_dev *hdev,
+ struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
@@ -1515,13 +1515,13 @@ static void hci_cc_le_clear_white_list(struct hci_dev *hdev,
if (status)
return;
- hci_bdaddr_list_clear(&hdev->le_white_list);
+ hci_bdaddr_list_clear(&hdev->le_accept_list);
}
-static void hci_cc_le_add_to_white_list(struct hci_dev *hdev,
- struct sk_buff *skb)
+static void hci_cc_le_add_to_accept_list(struct hci_dev *hdev,
+ struct sk_buff *skb)
{
- struct hci_cp_le_add_to_white_list *sent;
+ struct hci_cp_le_add_to_accept_list *sent;
__u8 status = *((__u8 *) skb->data);
BT_DBG("%s status 0x%2.2x", hdev->name, status);
@@ -1529,18 +1529,18 @@ static void hci_cc_le_add_to_white_list(struct hci_dev *hdev,
if (status)
return;
- sent = hci_sent_cmd_data(hdev, HCI_OP_LE_ADD_TO_WHITE_LIST);
+ sent = hci_sent_cmd_data(hdev, HCI_OP_LE_ADD_TO_ACCEPT_LIST);
if (!sent)
return;
- hci_bdaddr_list_add(&hdev->le_white_list, &sent->bdaddr,
- sent->bdaddr_type);
+ hci_bdaddr_list_add(&hdev->le_accept_list, &sent->bdaddr,
+ sent->bdaddr_type);
}
-static void hci_cc_le_del_from_white_list(struct hci_dev *hdev,
- struct sk_buff *skb)
+static void hci_cc_le_del_from_accept_list(struct hci_dev *hdev,
+ struct sk_buff *skb)
{
- struct hci_cp_le_del_from_white_list *sent;
+ struct hci_cp_le_del_from_accept_list *sent;
__u8 status = *((__u8 *) skb->data);
BT_DBG("%s status 0x%2.2x", hdev->name, status);
@@ -1548,11 +1548,11 @@ static void hci_cc_le_del_from_white_list(struct hci_dev *hdev,
if (status)
return;
- sent = hci_sent_cmd_data(hdev, HCI_OP_LE_DEL_FROM_WHITE_LIST);
+ sent = hci_sent_cmd_data(hdev, HCI_OP_LE_DEL_FROM_ACCEPT_LIST);
if (!sent)
return;
- hci_bdaddr_list_del(&hdev->le_white_list, &sent->bdaddr,
+ hci_bdaddr_list_del(&hdev->le_accept_list, &sent->bdaddr,
sent->bdaddr_type);
}
@@ -2367,7 +2367,7 @@ static void cs_le_create_conn(struct hci_dev *hdev, bdaddr_t *peer_addr,
/* We don't want the connection attempt to stick around
* indefinitely since LE doesn't have a page timeout concept
* like BR/EDR. Set a timer for any connection that doesn't use
- * the white list for connecting.
+ * the accept list for connecting.
*/
if (filter_policy == HCI_LE_USE_PEER_ADDR)
queue_delayed_work(conn->hdev->workqueue,
@@ -2623,7 +2623,7 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
* only used during suspend.
*/
if (ev->link_type == ACL_LINK &&
- hci_bdaddr_list_lookup_with_flags(&hdev->whitelist,
+ hci_bdaddr_list_lookup_with_flags(&hdev->accept_list,
&ev->bdaddr,
BDADDR_BREDR)) {
conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr,
@@ -2745,19 +2745,19 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
return;
}
- if (hci_bdaddr_list_lookup(&hdev->blacklist, &ev->bdaddr,
+ if (hci_bdaddr_list_lookup(&hdev->reject_list, &ev->bdaddr,
BDADDR_BREDR)) {
hci_reject_conn(hdev, &ev->bdaddr);
return;
}
- /* Require HCI_CONNECTABLE or a whitelist entry to accept the
+ /* Require HCI_CONNECTABLE or an accept list entry to accept the
* connection. These features are only touched through mgmt so
* only do the checks if HCI_MGMT is set.
*/
if (hci_dev_test_flag(hdev, HCI_MGMT) &&
!hci_dev_test_flag(hdev, HCI_CONNECTABLE) &&
- !hci_bdaddr_list_lookup_with_flags(&hdev->whitelist, &ev->bdaddr,
+ !hci_bdaddr_list_lookup_with_flags(&hdev->accept_list, &ev->bdaddr,
BDADDR_BREDR)) {
hci_reject_conn(hdev, &ev->bdaddr);
return;
@@ -3538,20 +3538,20 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb,
hci_cc_le_set_scan_enable(hdev, skb);
break;
- case HCI_OP_LE_READ_WHITE_LIST_SIZE:
- hci_cc_le_read_white_list_size(hdev, skb);
+ case HCI_OP_LE_READ_ACCEPT_LIST_SIZE:
+ hci_cc_le_read_accept_list_size(hdev, skb);
break;
- case HCI_OP_LE_CLEAR_WHITE_LIST:
- hci_cc_le_clear_white_list(hdev, skb);
+ case HCI_OP_LE_CLEAR_ACCEPT_LIST:
+ hci_cc_le_clear_accept_list(hdev, skb);
break;
- case HCI_OP_LE_ADD_TO_WHITE_LIST:
- hci_cc_le_add_to_white_list(hdev, skb);
+ case HCI_OP_LE_ADD_TO_ACCEPT_LIST:
+ hci_cc_le_add_to_accept_list(hdev, skb);
break;
- case HCI_OP_LE_DEL_FROM_WHITE_LIST:
- hci_cc_le_del_from_white_list(hdev, skb);
+ case HCI_OP_LE_DEL_FROM_ACCEPT_LIST:
+ hci_cc_le_del_from_accept_list(hdev, skb);
break;
case HCI_OP_LE_READ_SUPPORTED_STATES:
@@ -5132,7 +5132,7 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,
/* If we didn't have a hci_conn object previously
* but we're in central role this must be something
- * initiated using a white list. Since white list based
+ * initiated using an accept list. Since accept list based
* connections are not "first class citizens" we don't
* have full tracking of them. Therefore, we go ahead
* with a "best effort" approach of determining the
@@ -5224,7 +5224,7 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,
addr_type = BDADDR_LE_RANDOM;
/* Drop the connection if the device is blocked */
- if (hci_bdaddr_list_lookup(&hdev->blacklist, &conn->dst, addr_type)) {
+ if (hci_bdaddr_list_lookup(&hdev->reject_list, &conn->dst, addr_type)) {
hci_conn_drop(conn);
goto unlock;
}
@@ -5380,7 +5380,7 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,
return NULL;
/* Ignore if the device is blocked */
- if (hci_bdaddr_list_lookup(&hdev->blacklist, addr, addr_type))
+ if (hci_bdaddr_list_lookup(&hdev->reject_list, addr, addr_type))
return NULL;
/* Most controller will fail if we try to create new connections
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index a5d55175176e..f7a9d97f3e84 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -745,17 +745,17 @@ void hci_req_add_le_scan_disable(struct hci_request *req, bool rpa_le_conn)
}
}
-static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,
- u8 bdaddr_type)
+static void del_from_accept_list(struct hci_request *req, bdaddr_t *bdaddr,
+ u8 bdaddr_type)
{
- struct hci_cp_le_del_from_white_list cp;
+ struct hci_cp_le_del_from_accept_list cp;
cp.bdaddr_type = bdaddr_type;
bacpy(&cp.bdaddr, bdaddr);
- bt_dev_dbg(req->hdev, "Remove %pMR (0x%x) from whitelist", &cp.bdaddr,
+ bt_dev_dbg(req->hdev, "Remove %pMR (0x%x) from accept list", &cp.bdaddr,
cp.bdaddr_type);
- hci_req_add(req, HCI_OP_LE_DEL_FROM_WHITE_LIST, sizeof(cp), &cp);
+ hci_req_add(req, HCI_OP_LE_DEL_FROM_ACCEPT_LIST, sizeof(cp), &cp);
if (use_ll_privacy(req->hdev) &&
hci_dev_test_flag(req->hdev, HCI_ENABLE_LL_PRIVACY)) {
@@ -774,31 +774,31 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,
}
}
-/* Adds connection to white list if needed. On error, returns -1. */
-static int add_to_white_list(struct hci_request *req,
- struct hci_conn_params *params, u8 *num_entries,
- bool allow_rpa)
+/* Adds connection to accept list if needed. On error, returns -1. */
+static int add_to_accept_list(struct hci_request *req,
+ struct hci_conn_params *params, u8 *num_entries,
+ bool allow_rpa)
{
- struct hci_cp_le_add_to_white_list cp;
+ struct hci_cp_le_add_to_accept_list cp;
struct hci_dev *hdev = req->hdev;
- /* Already in white list */
- if (hci_bdaddr_list_lookup(&hdev->le_white_list, ¶ms->addr,
+ /* Already in accept list */
+ if (hci_bdaddr_list_lookup(&hdev->le_accept_list, ¶ms->addr,
params->addr_type))
return 0;
/* Select filter policy to accept all advertising */
- if (*num_entries >= hdev->le_white_list_size)
+ if (*num_entries >= hdev->le_accept_list_size)
return -1;
- /* White list can not be used with RPAs */
+ /* Accept list can not be used with RPAs */
if (!allow_rpa &&
!hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY) &&
hci_find_irk_by_addr(hdev, ¶ms->addr, params->addr_type)) {
return -1;
}
- /* During suspend, only wakeable devices can be in whitelist */
+ /* During suspend, only wakeable devices can be in accept list */
if (hdev->suspended && !hci_conn_test_flag(HCI_CONN_FLAG_REMOTE_WAKEUP,
params->current_flags))
return 0;
@@ -807,9 +807,9 @@ static int add_to_white_list(struct hci_request *req,
cp.bdaddr_type = params->addr_type;
bacpy(&cp.bdaddr, ¶ms->addr);
- bt_dev_dbg(hdev, "Add %pMR (0x%x) to whitelist", &cp.bdaddr,
+ bt_dev_dbg(hdev, "Add %pMR (0x%x) to accept list", &cp.bdaddr,
cp.bdaddr_type);
- hci_req_add(req, HCI_OP_LE_ADD_TO_WHITE_LIST, sizeof(cp), &cp);
+ hci_req_add(req, HCI_OP_LE_ADD_TO_ACCEPT_LIST, sizeof(cp), &cp);
if (use_ll_privacy(hdev) &&
hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY)) {
@@ -837,15 +837,15 @@ static int add_to_white_list(struct hci_request *req,
return 0;
}
-static u8 update_white_list(struct hci_request *req)
+static u8 update_accept_list(struct hci_request *req)
{
struct hci_dev *hdev = req->hdev;
struct hci_conn_params *params;
struct bdaddr_list *b;
u8 num_entries = 0;
bool pend_conn, pend_report;
- /* We allow whitelisting even with RPAs in suspend. In the worst case,
- * we won't be able to wake from devices that use the privacy1.2
+ /* We allow usage of accept list even with RPAs in suspend. In the worst
+ * case, we won't be able to wake from devices that use the privacy1.2
* features. Additionally, once we support privacy1.2 and IRK
* offloading, we can update this to also check for those conditions.
*/
@@ -855,13 +855,13 @@ static u8 update_white_list(struct hci_request *req)
hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY))
allow_rpa = true;
- /* Go through the current white list programmed into the
+ /* Go through the current accept list programmed into the
* controller one by one and check if that address is still
* in the list of pending connections or list of devices to
* report. If not present in either list, then queue the
* command to remove it from the controller.
*/
- list_for_each_entry(b, &hdev->le_white_list, list) {
+ list_for_each_entry(b, &hdev->le_accept_list, list) {
pend_conn = hci_pend_le_action_lookup(&hdev->pend_le_conns,
&b->bdaddr,
b->bdaddr_type);
@@ -870,14 +870,14 @@ static u8 update_white_list(struct hci_request *req)
b->bdaddr_type);
/* If the device is not likely to connect or report,
- * remove it from the whitelist.
+ * remove it from the accept list.
*/
if (!pend_conn && !pend_report) {
- del_from_white_list(req, &b->bdaddr, b->bdaddr_type);
+ del_from_accept_list(req, &b->bdaddr, b->bdaddr_type);
continue;
}
- /* White list can not be used with RPAs */
+ /* Accept list can not be used with RPAs */
if (!allow_rpa &&
!hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY) &&
hci_find_irk_by_addr(hdev, &b->bdaddr, b->bdaddr_type)) {
@@ -887,27 +887,27 @@ static u8 update_white_list(struct hci_request *req)
num_entries++;
}
- /* Since all no longer valid white list entries have been
+ /* Since all no longer valid accept list entries have been
* removed, walk through the list of pending connections
* and ensure that any new device gets programmed into
* the controller.
*
* If the list of the devices is larger than the list of
- * available white list entries in the controller, then
+ * available accept list entries in the controller, then
* just abort and return filer policy value to not use the
- * white list.
+ * accept list.
*/
list_for_each_entry(params, &hdev->pend_le_conns, action) {
- if (add_to_white_list(req, params, &num_entries, allow_rpa))
+ if (add_to_accept_list(req, params, &num_entries, allow_rpa))
return 0x00;
}
/* After adding all new pending connections, walk through
* the list of pending reports and also add these to the
- * white list if there is still space. Abort if space runs out.
+ * accept list if there is still space. Abort if space runs out.
*/
list_for_each_entry(params, &hdev->pend_le_reports, action) {
- if (add_to_white_list(req, params, &num_entries, allow_rpa))
+ if (add_to_accept_list(req, params, &num_entries, allow_rpa))
return 0x00;
}
@@ -921,7 +921,7 @@ static u8 update_white_list(struct hci_request *req)
hdev->interleave_scan_state != INTERLEAVE_SCAN_ALLOWLIST)
return 0x00;
- /* Select filter policy to use white list */
+ /* Select filter policy to use accept list */
return 0x01;
}
@@ -1078,20 +1078,20 @@ void hci_req_add_le_passive_scan(struct hci_request *req)
return;
bt_dev_dbg(hdev, "interleave state %d", hdev->interleave_scan_state);
- /* Adding or removing entries from the white list must
+ /* Adding or removing entries from the accept list must
* happen before enabling scanning. The controller does
- * not allow white list modification while scanning.
+ * not allow accept list modification while scanning.
*/
- filter_policy = update_white_list(req);
+ filter_policy = update_accept_list(req);
/* When the controller is using random resolvable addresses and
* with that having LE privacy enabled, then controllers with
* Extended Scanner Filter Policies support can now enable support
* for handling directed advertising.
*
- * So instead of using filter polices 0x00 (no whitelist)
- * and 0x01 (whitelist enabled) use the new filter policies
- * 0x02 (no whitelist) and 0x03 (whitelist enabled).
+ * So instead of using filter polices 0x00 (no accept list)
+ * and 0x01 (accept list enabled) use the new filter policies
+ * 0x02 (no accept list) and 0x03 (accept list enabled).
*/
if (hci_dev_test_flag(hdev, HCI_PRIVACY) &&
(hdev->le_features[0] & HCI_LE_EXT_SCAN_POLICY))
@@ -1127,7 +1127,8 @@ void hci_req_add_le_passive_scan(struct hci_request *req)
interval = hdev->le_scan_interval;
}
- bt_dev_dbg(hdev, "LE passive scan with whitelist = %d", filter_policy);
+ bt_dev_dbg(hdev, "LE passive scan with accept list = %d",
+ filter_policy);
hci_req_start_scan(req, LE_SCAN_PASSIVE, interval, window,
own_addr_type, filter_policy, filter_dup,
addr_resolv);
@@ -1180,7 +1181,7 @@ static void hci_req_set_event_filter(struct hci_request *req)
/* Always clear event filter when starting */
hci_req_clear_event_filter(req);
- list_for_each_entry(b, &hdev->whitelist, list) {
+ list_for_each_entry(b, &hdev->accept_list, list) {
if (!hci_conn_test_flag(HCI_CONN_FLAG_REMOTE_WAKEUP,
b->current_flags))
continue;
@@ -2623,11 +2624,11 @@ int hci_update_random_address(struct hci_request *req, bool require_privacy,
return 0;
}
-static bool disconnected_whitelist_entries(struct hci_dev *hdev)
+static bool disconnected_accept_list_entries(struct hci_dev *hdev)
{
struct bdaddr_list *b;
- list_for_each_entry(b, &hdev->whitelist, list) {
+ list_for_each_entry(b, &hdev->accept_list, list) {
struct hci_conn *conn;
conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &b->bdaddr);
@@ -2659,7 +2660,7 @@ void __hci_req_update_scan(struct hci_request *req)
return;
if (hci_dev_test_flag(hdev, HCI_CONNECTABLE) ||
- disconnected_whitelist_entries(hdev))
+ disconnected_accept_list_entries(hdev))
scan = SCAN_PAGE;
else
scan = SCAN_DISABLED;
@@ -3151,7 +3152,7 @@ static int active_scan(struct hci_request *req, unsigned long opt)
uint16_t interval = opt;
struct hci_dev *hdev = req->hdev;
u8 own_addr_type;
- /* White list is not used for discovery */
+ /* Accept list is not used for discovery */
u8 filter_policy = 0x00;
/* Default is to enable duplicates filter */
u8 filter_dup = LE_SCAN_FILTER_DUP_ENABLE;
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 251b9128f530..26d794b164f1 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -892,7 +892,7 @@ static int hci_sock_release(struct socket *sock)
return 0;
}
-static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg)
+static int hci_sock_reject_list_add(struct hci_dev *hdev, void __user *arg)
{
bdaddr_t bdaddr;
int err;
@@ -902,14 +902,14 @@ static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg)
hci_dev_lock(hdev);
- err = hci_bdaddr_list_add(&hdev->blacklist, &bdaddr, BDADDR_BREDR);
+ err = hci_bdaddr_list_add(&hdev->reject_list, &bdaddr, BDADDR_BREDR);
hci_dev_unlock(hdev);
return err;
}
-static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)
+static int hci_sock_reject_list_del(struct hci_dev *hdev, void __user *arg)
{
bdaddr_t bdaddr;
int err;
@@ -919,7 +919,7 @@ static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)
hci_dev_lock(hdev);
- err = hci_bdaddr_list_del(&hdev->blacklist, &bdaddr, BDADDR_BREDR);
+ err = hci_bdaddr_list_del(&hdev->reject_list, &bdaddr, BDADDR_BREDR);
hci_dev_unlock(hdev);
@@ -959,12 +959,12 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,
case HCIBLOCKADDR:
if (!capable(CAP_NET_ADMIN))
return -EPERM;
- return hci_sock_blacklist_add(hdev, (void __user *)arg);
+ return hci_sock_reject_list_add(hdev, (void __user *)arg);
case HCIUNBLOCKADDR:
if (!capable(CAP_NET_ADMIN))
return -EPERM;
- return hci_sock_blacklist_del(hdev, (void __user *)arg);
+ return hci_sock_reject_list_del(hdev, (void __user *)arg);
}
return -ENOIOCTLCMD;
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index c10a45368ec2..6b0f8f7867bc 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -7662,7 +7662,7 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
* at least ensure that we ignore incoming data from them.
*/
if (hcon->type == LE_LINK &&
- hci_bdaddr_list_lookup(&hcon->hdev->blacklist, &hcon->dst,
+ hci_bdaddr_list_lookup(&hcon->hdev->reject_list, &hcon->dst,
bdaddr_dst_type(hcon))) {
kfree_skb(skb);
return;
@@ -8119,7 +8119,7 @@ static void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
dst_type = bdaddr_dst_type(hcon);
/* If device is blocked, do not create channels for it */
- if (hci_bdaddr_list_lookup(&hdev->blacklist, &hcon->dst, dst_type))
+ if (hci_bdaddr_list_lookup(&hdev->reject_list, &hcon->dst, dst_type))
return;
/* Find fixed channels and notify them of the new connection. We
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 6adee6de1e03..f0e4ebed72b8 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4064,9 +4064,10 @@ static int get_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,
memset(&rp, 0, sizeof(rp));
if (cp->addr.type == BDADDR_BREDR) {
- br_params = hci_bdaddr_list_lookup_with_flags(&hdev->whitelist,
- &cp->addr.bdaddr,
- cp->addr.type);
+ br_params =
+ hci_bdaddr_list_lookup_with_flags(&hdev->accept_list,
+ &cp->addr.bdaddr,
+ cp->addr.type);
if (!br_params)
goto done;
@@ -4132,9 +4133,10 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,
hci_dev_lock(hdev);
if (cp->addr.type == BDADDR_BREDR) {
- br_params = hci_bdaddr_list_lookup_with_flags(&hdev->whitelist,
- &cp->addr.bdaddr,
- cp->addr.type);
+ br_params =
+ hci_bdaddr_list_lookup_with_flags(&hdev->accept_list,
+ &cp->addr.bdaddr,
+ cp->addr.type);
if (br_params) {
br_params->current_flags = current_flags;
@@ -5209,7 +5211,7 @@ static int block_device(struct sock *sk, struct hci_dev *hdev, void *data,
hci_dev_lock(hdev);
- err = hci_bdaddr_list_add(&hdev->blacklist, &cp->addr.bdaddr,
+ err = hci_bdaddr_list_add(&hdev->reject_list, &cp->addr.bdaddr,
cp->addr.type);
if (err < 0) {
status = MGMT_STATUS_FAILED;
@@ -5245,7 +5247,7 @@ static int unblock_device(struct sock *sk, struct hci_dev *hdev, void *data,
hci_dev_lock(hdev);
- err = hci_bdaddr_list_del(&hdev->blacklist, &cp->addr.bdaddr,
+ err = hci_bdaddr_list_del(&hdev->reject_list, &cp->addr.bdaddr,
cp->addr.type);
if (err < 0) {
status = MGMT_STATUS_INVALID_PARAMS;
@@ -6736,7 +6738,7 @@ static int add_device(struct sock *sk, struct hci_dev *hdev,
goto unlock;
}
- err = hci_bdaddr_list_add_with_flags(&hdev->whitelist,
+ err = hci_bdaddr_list_add_with_flags(&hdev->accept_list,
&cp->addr.bdaddr,
cp->addr.type, 0);
if (err)
@@ -6834,7 +6836,7 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,
}
if (cp->addr.type == BDADDR_BREDR) {
- err = hci_bdaddr_list_del(&hdev->whitelist,
+ err = hci_bdaddr_list_del(&hdev->accept_list,
&cp->addr.bdaddr,
cp->addr.type);
if (err) {
@@ -6905,7 +6907,7 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,
goto unlock;
}
- list_for_each_entry_safe(b, btmp, &hdev->whitelist, list) {
+ list_for_each_entry_safe(b, btmp, &hdev->accept_list, list) {
device_removed(sk, hdev, &b->bdaddr, b->bdaddr_type);
list_del(&b->list);
kfree(b);
--
2.32.0.rc0.204.g9fa02ecfa5-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v2 7/8] Bluetooth: use inclusive language when filtering devices
2021-05-31 8:37 ` [PATCH v2 7/8] Bluetooth: use inclusive language when filtering devices Archie Pusaka
@ 2021-06-02 20:04 ` Marcel Holtmann
0 siblings, 0 replies; 12+ messages in thread
From: Marcel Holtmann @ 2021-06-02 20:04 UTC (permalink / raw)
To: Archie Pusaka
Cc: linux-bluetooth, CrosBT Upstreaming, Archie Pusaka,
Miao-chen Chou, David S. Miller, Jakub Kicinski, Johan Hedberg,
Luiz Augusto von Dentz, linux-kernel, netdev
Hi Archie,
> 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:
> blacklist -> reject list
> whitelist -> accept list
>
> Signed-off-by: Archie Pusaka <apusaka@chromium.org>
> Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
>
> ---
>
> Changes in v2:
> * Add details in commit message
> * Was actually two patches, squashed together
>
> include/net/bluetooth/hci.h | 16 +++---
> include/net/bluetooth/hci_core.h | 8 +--
> net/bluetooth/hci_core.c | 24 ++++-----
> net/bluetooth/hci_debugfs.c | 8 +--
> net/bluetooth/hci_event.c | 70 ++++++++++++-------------
> net/bluetooth/hci_request.c | 89 ++++++++++++++++----------------
> net/bluetooth/hci_sock.c | 12 ++---
> net/bluetooth/l2cap_core.c | 4 +-
> net/bluetooth/mgmt.c | 24 +++++----
> 9 files changed, 129 insertions(+), 126 deletions(-)
>
> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
> index 441125f6b616..e6801ed7ad6e 100644
> --- a/include/net/bluetooth/hci.h
> +++ b/include/net/bluetooth/hci.h
> @@ -1505,7 +1505,7 @@ struct hci_cp_le_set_scan_enable {
> } __packed;
>
> #define HCI_LE_USE_PEER_ADDR 0x00
> -#define HCI_LE_USE_WHITELIST 0x01
> +#define HCI_LE_USE_ACCEPT_LIST 0x01
>
> #define HCI_OP_LE_CREATE_CONN 0x200d
> struct hci_cp_le_create_conn {
> @@ -1525,22 +1525,22 @@ struct hci_cp_le_create_conn {
>
> #define HCI_OP_LE_CREATE_CONN_CANCEL 0x200e
>
> -#define HCI_OP_LE_READ_WHITE_LIST_SIZE 0x200f
> -struct hci_rp_le_read_white_list_size {
> +#define HCI_OP_LE_READ_ACCEPT_LIST_SIZE 0x200f
> +struct hci_rp_le_read_accept_list_size {
> __u8 status;
> __u8 size;
> } __packed;
>
> -#define HCI_OP_LE_CLEAR_WHITE_LIST 0x2010
> +#define HCI_OP_LE_CLEAR_ACCEPT_LIST 0x2010
>
> -#define HCI_OP_LE_ADD_TO_WHITE_LIST 0x2011
> -struct hci_cp_le_add_to_white_list {
> +#define HCI_OP_LE_ADD_TO_ACCEPT_LIST 0x2011
> +struct hci_cp_le_add_to_accept_list {
> __u8 bdaddr_type;
> bdaddr_t bdaddr;
> } __packed;
>
> -#define HCI_OP_LE_DEL_FROM_WHITE_LIST 0x2012
> -struct hci_cp_le_del_from_white_list {
> +#define HCI_OP_LE_DEL_FROM_ACCEPT_LIST 0x2012
> +struct hci_cp_le_del_from_accept_list {
> __u8 bdaddr_type;
> bdaddr_t bdaddr;
> } __packed;
> diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
> index cfe2ada49ca2..163caeac46a5 100644
> --- a/include/net/bluetooth/hci_core.h
> +++ b/include/net/bluetooth/hci_core.h
> @@ -327,7 +327,7 @@ struct hci_dev {
> __u8 max_page;
> __u8 features[HCI_MAX_PAGES][8];
> __u8 le_features[8];
> - __u8 le_white_list_size;
> + __u8 le_accept_list_size;
> __u8 le_resolv_list_size;
> __u8 le_num_of_adv_sets;
> __u8 le_states[8];
> @@ -522,14 +522,14 @@ struct hci_dev {
> struct hci_conn_hash conn_hash;
>
> struct list_head mgmt_pending;
> - struct list_head blacklist;
> - struct list_head whitelist;
> + struct list_head reject_list;
> + struct list_head accept_list;
> struct list_head uuids;
> struct list_head link_keys;
> struct list_head long_term_keys;
> struct list_head identity_resolving_keys;
> struct list_head remote_oob_data;
> - struct list_head le_white_list;
> + struct list_head le_accept_list;
> struct list_head le_resolv_list;
> struct list_head le_conn_params;
> struct list_head pend_le_conns;
> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> index b9ebad0f8fb9..8cf1c0068d11 100644
> --- a/net/bluetooth/hci_core.c
> +++ b/net/bluetooth/hci_core.c
> @@ -749,14 +749,14 @@ static int hci_init3_req(struct hci_request *req, unsigned long opt)
> }
>
> if (hdev->commands[26] & 0x40) {
> - /* Read LE White List Size */
> - hci_req_add(req, HCI_OP_LE_READ_WHITE_LIST_SIZE,
> + /* Read LE Accept List Size */
> + hci_req_add(req, HCI_OP_LE_READ_ACCEPT_LIST_SIZE,
> 0, NULL);
> }
>
> if (hdev->commands[26] & 0x80) {
> - /* Clear LE White List */
> - hci_req_add(req, HCI_OP_LE_CLEAR_WHITE_LIST, 0, NULL);
> + /* Clear LE Accept List */
> + hci_req_add(req, HCI_OP_LE_CLEAR_ACCEPT_LIST, 0, NULL);
> }
>
> if (hdev->commands[34] & 0x40) {
> @@ -3708,13 +3708,13 @@ static int hci_suspend_notifier(struct notifier_block *nb, unsigned long action,
> /* Suspend consists of two actions:
> * - First, disconnect everything and make the controller not
> * connectable (disabling scanning)
> - * - Second, program event filter/whitelist and enable scan
> + * - Second, program event filter/accept list and enable scan
> */
> ret = hci_change_suspend_state(hdev, BT_SUSPEND_DISCONNECT);
> if (!ret)
> state = BT_SUSPEND_DISCONNECT;
>
> - /* Only configure whitelist if disconnect succeeded and wake
> + /* Only configure accept list if disconnect succeeded and wake
> * isn't being prevented.
> */
> if (!ret && !(hdev->prevent_wake && hdev->prevent_wake(hdev))) {
> @@ -3822,14 +3822,14 @@ struct hci_dev *hci_alloc_dev(void)
> mutex_init(&hdev->req_lock);
>
> INIT_LIST_HEAD(&hdev->mgmt_pending);
> - INIT_LIST_HEAD(&hdev->blacklist);
> - INIT_LIST_HEAD(&hdev->whitelist);
> + INIT_LIST_HEAD(&hdev->reject_list);
> + INIT_LIST_HEAD(&hdev->accept_list);
> INIT_LIST_HEAD(&hdev->uuids);
> INIT_LIST_HEAD(&hdev->link_keys);
> INIT_LIST_HEAD(&hdev->long_term_keys);
> INIT_LIST_HEAD(&hdev->identity_resolving_keys);
> INIT_LIST_HEAD(&hdev->remote_oob_data);
> - INIT_LIST_HEAD(&hdev->le_white_list);
> + INIT_LIST_HEAD(&hdev->le_accept_list);
> INIT_LIST_HEAD(&hdev->le_resolv_list);
> INIT_LIST_HEAD(&hdev->le_conn_params);
> INIT_LIST_HEAD(&hdev->pend_le_conns);
> @@ -4042,8 +4042,8 @@ void hci_unregister_dev(struct hci_dev *hdev)
> destroy_workqueue(hdev->req_workqueue);
>
> hci_dev_lock(hdev);
> - hci_bdaddr_list_clear(&hdev->blacklist);
> - hci_bdaddr_list_clear(&hdev->whitelist);
> + hci_bdaddr_list_clear(&hdev->reject_list);
> + hci_bdaddr_list_clear(&hdev->accept_list);
> hci_uuids_clear(hdev);
> hci_link_keys_clear(hdev);
> hci_smp_ltks_clear(hdev);
> @@ -4051,7 +4051,7 @@ void hci_unregister_dev(struct hci_dev *hdev)
> hci_remote_oob_data_clear(hdev);
> hci_adv_instances_clear(hdev);
> hci_adv_monitors_clear(hdev);
> - hci_bdaddr_list_clear(&hdev->le_white_list);
> + hci_bdaddr_list_clear(&hdev->le_accept_list);
> hci_bdaddr_list_clear(&hdev->le_resolv_list);
> hci_conn_params_clear_all(hdev);
> hci_discovery_filter_clear(hdev);
> diff --git a/net/bluetooth/hci_debugfs.c b/net/bluetooth/hci_debugfs.c
> index 47f4f21fbc1a..841393389f7b 100644
> --- a/net/bluetooth/hci_debugfs.c
> +++ b/net/bluetooth/hci_debugfs.c
> @@ -125,7 +125,7 @@ static int device_list_show(struct seq_file *f, void *ptr)
> struct bdaddr_list *b;
>
> hci_dev_lock(hdev);
> - list_for_each_entry(b, &hdev->whitelist, list)
> + list_for_each_entry(b, &hdev->accept_list, list)
> seq_printf(f, "%pMR (type %u)\n", &b->bdaddr, b->bdaddr_type);
> list_for_each_entry(p, &hdev->le_conn_params, list) {
> seq_printf(f, "%pMR (type %u) %u\n", &p->addr, p->addr_type,
> @@ -144,7 +144,7 @@ static int blacklist_show(struct seq_file *f, void *p)
> struct bdaddr_list *b;
>
> hci_dev_lock(hdev);
> - list_for_each_entry(b, &hdev->blacklist, list)
> + list_for_each_entry(b, &hdev->reject_list, list)
> seq_printf(f, "%pMR (type %u)\n", &b->bdaddr, b->bdaddr_type);
> hci_dev_unlock(hdev);
>
> @@ -784,7 +784,7 @@ static int white_list_show(struct seq_file *f, void *ptr)
> struct bdaddr_list *b;
>
> hci_dev_lock(hdev);
> - list_for_each_entry(b, &hdev->le_white_list, list)
> + list_for_each_entry(b, &hdev->le_accept_list, list)
> seq_printf(f, "%pMR (type %u)\n", &b->bdaddr, b->bdaddr_type);
> hci_dev_unlock(hdev);
>
> @@ -1195,7 +1195,7 @@ void hci_debugfs_create_le(struct hci_dev *hdev)
> &force_static_address_fops);
>
> debugfs_create_u8("white_list_size", 0444, hdev->debugfs,
> - &hdev->le_white_list_size);
> + &hdev->le_accept_list_size);
> debugfs_create_file("white_list", 0444, hdev->debugfs, hdev,
> &white_list_fops);
> debugfs_create_u8("resolv_list_size", 0444, hdev->debugfs,
> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> index c5871c2a16ba..760e8e14e0f2 100644
> --- a/net/bluetooth/hci_event.c
> +++ b/net/bluetooth/hci_event.c
> @@ -236,7 +236,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
>
> hdev->ssp_debug_mode = 0;
>
> - hci_bdaddr_list_clear(&hdev->le_white_list);
> + hci_bdaddr_list_clear(&hdev->le_accept_list);
> hci_bdaddr_list_clear(&hdev->le_resolv_list);
> }
>
> @@ -1492,21 +1492,21 @@ static void hci_cc_le_read_num_adv_sets(struct hci_dev *hdev,
> hdev->le_num_of_adv_sets = rp->num_of_sets;
> }
>
> -static void hci_cc_le_read_white_list_size(struct hci_dev *hdev,
> - struct sk_buff *skb)
> +static void hci_cc_le_read_accept_list_size(struct hci_dev *hdev,
> + struct sk_buff *skb)
> {
> - struct hci_rp_le_read_white_list_size *rp = (void *) skb->data;
> + struct hci_rp_le_read_accept_list_size *rp = (void *)skb->data;
>
> BT_DBG("%s status 0x%2.2x size %u", hdev->name, rp->status, rp->size);
>
> if (rp->status)
> return;
>
> - hdev->le_white_list_size = rp->size;
> + hdev->le_accept_list_size = rp->size;
> }
>
> -static void hci_cc_le_clear_white_list(struct hci_dev *hdev,
> - struct sk_buff *skb)
> +static void hci_cc_le_clear_accept_list(struct hci_dev *hdev,
> + struct sk_buff *skb)
> {
> __u8 status = *((__u8 *) skb->data);
>
> @@ -1515,13 +1515,13 @@ static void hci_cc_le_clear_white_list(struct hci_dev *hdev,
> if (status)
> return;
>
> - hci_bdaddr_list_clear(&hdev->le_white_list);
> + hci_bdaddr_list_clear(&hdev->le_accept_list);
> }
>
> -static void hci_cc_le_add_to_white_list(struct hci_dev *hdev,
> - struct sk_buff *skb)
> +static void hci_cc_le_add_to_accept_list(struct hci_dev *hdev,
> + struct sk_buff *skb)
> {
> - struct hci_cp_le_add_to_white_list *sent;
> + struct hci_cp_le_add_to_accept_list *sent;
> __u8 status = *((__u8 *) skb->data);
>
> BT_DBG("%s status 0x%2.2x", hdev->name, status);
> @@ -1529,18 +1529,18 @@ static void hci_cc_le_add_to_white_list(struct hci_dev *hdev,
> if (status)
> return;
>
> - sent = hci_sent_cmd_data(hdev, HCI_OP_LE_ADD_TO_WHITE_LIST);
> + sent = hci_sent_cmd_data(hdev, HCI_OP_LE_ADD_TO_ACCEPT_LIST);
> if (!sent)
> return;
>
> - hci_bdaddr_list_add(&hdev->le_white_list, &sent->bdaddr,
> - sent->bdaddr_type);
> + hci_bdaddr_list_add(&hdev->le_accept_list, &sent->bdaddr,
> + sent->bdaddr_type);
> }
>
> -static void hci_cc_le_del_from_white_list(struct hci_dev *hdev,
> - struct sk_buff *skb)
> +static void hci_cc_le_del_from_accept_list(struct hci_dev *hdev,
> + struct sk_buff *skb)
> {
> - struct hci_cp_le_del_from_white_list *sent;
> + struct hci_cp_le_del_from_accept_list *sent;
> __u8 status = *((__u8 *) skb->data);
>
> BT_DBG("%s status 0x%2.2x", hdev->name, status);
> @@ -1548,11 +1548,11 @@ static void hci_cc_le_del_from_white_list(struct hci_dev *hdev,
> if (status)
> return;
>
> - sent = hci_sent_cmd_data(hdev, HCI_OP_LE_DEL_FROM_WHITE_LIST);
> + sent = hci_sent_cmd_data(hdev, HCI_OP_LE_DEL_FROM_ACCEPT_LIST);
> if (!sent)
> return;
>
> - hci_bdaddr_list_del(&hdev->le_white_list, &sent->bdaddr,
> + hci_bdaddr_list_del(&hdev->le_accept_list, &sent->bdaddr,
> sent->bdaddr_type);
> }
>
> @@ -2367,7 +2367,7 @@ static void cs_le_create_conn(struct hci_dev *hdev, bdaddr_t *peer_addr,
> /* We don't want the connection attempt to stick around
> * indefinitely since LE doesn't have a page timeout concept
> * like BR/EDR. Set a timer for any connection that doesn't use
> - * the white list for connecting.
> + * the accept list for connecting.
> */
> if (filter_policy == HCI_LE_USE_PEER_ADDR)
> queue_delayed_work(conn->hdev->workqueue,
> @@ -2623,7 +2623,7 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
> * only used during suspend.
> */
> if (ev->link_type == ACL_LINK &&
> - hci_bdaddr_list_lookup_with_flags(&hdev->whitelist,
> + hci_bdaddr_list_lookup_with_flags(&hdev->accept_list,
> &ev->bdaddr,
> BDADDR_BREDR)) {
> conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr,
> @@ -2745,19 +2745,19 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
> return;
> }
>
> - if (hci_bdaddr_list_lookup(&hdev->blacklist, &ev->bdaddr,
> + if (hci_bdaddr_list_lookup(&hdev->reject_list, &ev->bdaddr,
> BDADDR_BREDR)) {
> hci_reject_conn(hdev, &ev->bdaddr);
> return;
> }
>
> - /* Require HCI_CONNECTABLE or a whitelist entry to accept the
> + /* Require HCI_CONNECTABLE or an accept list entry to accept the
> * connection. These features are only touched through mgmt so
> * only do the checks if HCI_MGMT is set.
> */
> if (hci_dev_test_flag(hdev, HCI_MGMT) &&
> !hci_dev_test_flag(hdev, HCI_CONNECTABLE) &&
> - !hci_bdaddr_list_lookup_with_flags(&hdev->whitelist, &ev->bdaddr,
> + !hci_bdaddr_list_lookup_with_flags(&hdev->accept_list, &ev->bdaddr,
> BDADDR_BREDR)) {
> hci_reject_conn(hdev, &ev->bdaddr);
> return;
> @@ -3538,20 +3538,20 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb,
> hci_cc_le_set_scan_enable(hdev, skb);
> break;
>
> - case HCI_OP_LE_READ_WHITE_LIST_SIZE:
> - hci_cc_le_read_white_list_size(hdev, skb);
> + case HCI_OP_LE_READ_ACCEPT_LIST_SIZE:
> + hci_cc_le_read_accept_list_size(hdev, skb);
> break;
>
> - case HCI_OP_LE_CLEAR_WHITE_LIST:
> - hci_cc_le_clear_white_list(hdev, skb);
> + case HCI_OP_LE_CLEAR_ACCEPT_LIST:
> + hci_cc_le_clear_accept_list(hdev, skb);
> break;
>
> - case HCI_OP_LE_ADD_TO_WHITE_LIST:
> - hci_cc_le_add_to_white_list(hdev, skb);
> + case HCI_OP_LE_ADD_TO_ACCEPT_LIST:
> + hci_cc_le_add_to_accept_list(hdev, skb);
> break;
>
> - case HCI_OP_LE_DEL_FROM_WHITE_LIST:
> - hci_cc_le_del_from_white_list(hdev, skb);
> + case HCI_OP_LE_DEL_FROM_ACCEPT_LIST:
> + hci_cc_le_del_from_accept_list(hdev, skb);
> break;
>
> case HCI_OP_LE_READ_SUPPORTED_STATES:
> @@ -5132,7 +5132,7 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,
>
> /* If we didn't have a hci_conn object previously
> * but we're in central role this must be something
> - * initiated using a white list. Since white list based
> + * initiated using an accept list. Since accept list based
> * connections are not "first class citizens" we don't
> * have full tracking of them. Therefore, we go ahead
> * with a "best effort" approach of determining the
> @@ -5224,7 +5224,7 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,
> addr_type = BDADDR_LE_RANDOM;
>
> /* Drop the connection if the device is blocked */
> - if (hci_bdaddr_list_lookup(&hdev->blacklist, &conn->dst, addr_type)) {
> + if (hci_bdaddr_list_lookup(&hdev->reject_list, &conn->dst, addr_type)) {
> hci_conn_drop(conn);
> goto unlock;
> }
> @@ -5380,7 +5380,7 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,
> return NULL;
>
> /* Ignore if the device is blocked */
> - if (hci_bdaddr_list_lookup(&hdev->blacklist, addr, addr_type))
> + if (hci_bdaddr_list_lookup(&hdev->reject_list, addr, addr_type))
> return NULL;
>
> /* Most controller will fail if we try to create new connections
> diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
> index a5d55175176e..f7a9d97f3e84 100644
> --- a/net/bluetooth/hci_request.c
> +++ b/net/bluetooth/hci_request.c
> @@ -745,17 +745,17 @@ void hci_req_add_le_scan_disable(struct hci_request *req, bool rpa_le_conn)
> }
> }
>
> -static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,
> - u8 bdaddr_type)
> +static void del_from_accept_list(struct hci_request *req, bdaddr_t *bdaddr,
> + u8 bdaddr_type)
> {
> - struct hci_cp_le_del_from_white_list cp;
> + struct hci_cp_le_del_from_accept_list cp;
>
> cp.bdaddr_type = bdaddr_type;
> bacpy(&cp.bdaddr, bdaddr);
>
> - bt_dev_dbg(req->hdev, "Remove %pMR (0x%x) from whitelist", &cp.bdaddr,
> + bt_dev_dbg(req->hdev, "Remove %pMR (0x%x) from accept list", &cp.bdaddr,
> cp.bdaddr_type);
> - hci_req_add(req, HCI_OP_LE_DEL_FROM_WHITE_LIST, sizeof(cp), &cp);
> + hci_req_add(req, HCI_OP_LE_DEL_FROM_ACCEPT_LIST, sizeof(cp), &cp);
>
> if (use_ll_privacy(req->hdev) &&
> hci_dev_test_flag(req->hdev, HCI_ENABLE_LL_PRIVACY)) {
> @@ -774,31 +774,31 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,
> }
> }
>
> -/* Adds connection to white list if needed. On error, returns -1. */
> -static int add_to_white_list(struct hci_request *req,
> - struct hci_conn_params *params, u8 *num_entries,
> - bool allow_rpa)
> +/* Adds connection to accept list if needed. On error, returns -1. */
> +static int add_to_accept_list(struct hci_request *req,
> + struct hci_conn_params *params, u8 *num_entries,
> + bool allow_rpa)
> {
> - struct hci_cp_le_add_to_white_list cp;
> + struct hci_cp_le_add_to_accept_list cp;
> struct hci_dev *hdev = req->hdev;
>
> - /* Already in white list */
> - if (hci_bdaddr_list_lookup(&hdev->le_white_list, ¶ms->addr,
> + /* Already in accept list */
> + if (hci_bdaddr_list_lookup(&hdev->le_accept_list, ¶ms->addr,
> params->addr_type))
> return 0;
>
> /* Select filter policy to accept all advertising */
> - if (*num_entries >= hdev->le_white_list_size)
> + if (*num_entries >= hdev->le_accept_list_size)
> return -1;
>
> - /* White list can not be used with RPAs */
> + /* Accept list can not be used with RPAs */
> if (!allow_rpa &&
> !hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY) &&
> hci_find_irk_by_addr(hdev, ¶ms->addr, params->addr_type)) {
> return -1;
> }
>
> - /* During suspend, only wakeable devices can be in whitelist */
> + /* During suspend, only wakeable devices can be in accept list */
> if (hdev->suspended && !hci_conn_test_flag(HCI_CONN_FLAG_REMOTE_WAKEUP,
> params->current_flags))
> return 0;
> @@ -807,9 +807,9 @@ static int add_to_white_list(struct hci_request *req,
> cp.bdaddr_type = params->addr_type;
> bacpy(&cp.bdaddr, ¶ms->addr);
>
> - bt_dev_dbg(hdev, "Add %pMR (0x%x) to whitelist", &cp.bdaddr,
> + bt_dev_dbg(hdev, "Add %pMR (0x%x) to accept list", &cp.bdaddr,
> cp.bdaddr_type);
> - hci_req_add(req, HCI_OP_LE_ADD_TO_WHITE_LIST, sizeof(cp), &cp);
> + hci_req_add(req, HCI_OP_LE_ADD_TO_ACCEPT_LIST, sizeof(cp), &cp);
>
> if (use_ll_privacy(hdev) &&
> hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY)) {
> @@ -837,15 +837,15 @@ static int add_to_white_list(struct hci_request *req,
> return 0;
> }
>
> -static u8 update_white_list(struct hci_request *req)
> +static u8 update_accept_list(struct hci_request *req)
> {
> struct hci_dev *hdev = req->hdev;
> struct hci_conn_params *params;
> struct bdaddr_list *b;
> u8 num_entries = 0;
> bool pend_conn, pend_report;
> - /* We allow whitelisting even with RPAs in suspend. In the worst case,
> - * we won't be able to wake from devices that use the privacy1.2
> + /* We allow usage of accept list even with RPAs in suspend. In the worst
> + * case, we won't be able to wake from devices that use the privacy1.2
> * features. Additionally, once we support privacy1.2 and IRK
> * offloading, we can update this to also check for those conditions.
> */
> @@ -855,13 +855,13 @@ static u8 update_white_list(struct hci_request *req)
> hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY))
> allow_rpa = true;
>
> - /* Go through the current white list programmed into the
> + /* Go through the current accept list programmed into the
> * controller one by one and check if that address is still
> * in the list of pending connections or list of devices to
> * report. If not present in either list, then queue the
> * command to remove it from the controller.
> */
> - list_for_each_entry(b, &hdev->le_white_list, list) {
> + list_for_each_entry(b, &hdev->le_accept_list, list) {
> pend_conn = hci_pend_le_action_lookup(&hdev->pend_le_conns,
> &b->bdaddr,
> b->bdaddr_type);
> @@ -870,14 +870,14 @@ static u8 update_white_list(struct hci_request *req)
> b->bdaddr_type);
>
> /* If the device is not likely to connect or report,
> - * remove it from the whitelist.
> + * remove it from the accept list.
> */
> if (!pend_conn && !pend_report) {
> - del_from_white_list(req, &b->bdaddr, b->bdaddr_type);
> + del_from_accept_list(req, &b->bdaddr, b->bdaddr_type);
> continue;
> }
>
> - /* White list can not be used with RPAs */
> + /* Accept list can not be used with RPAs */
> if (!allow_rpa &&
> !hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY) &&
> hci_find_irk_by_addr(hdev, &b->bdaddr, b->bdaddr_type)) {
> @@ -887,27 +887,27 @@ static u8 update_white_list(struct hci_request *req)
> num_entries++;
> }
>
> - /* Since all no longer valid white list entries have been
> + /* Since all no longer valid accept list entries have been
> * removed, walk through the list of pending connections
> * and ensure that any new device gets programmed into
> * the controller.
> *
> * If the list of the devices is larger than the list of
> - * available white list entries in the controller, then
> + * available accept list entries in the controller, then
> * just abort and return filer policy value to not use the
> - * white list.
> + * accept list.
> */
> list_for_each_entry(params, &hdev->pend_le_conns, action) {
> - if (add_to_white_list(req, params, &num_entries, allow_rpa))
> + if (add_to_accept_list(req, params, &num_entries, allow_rpa))
> return 0x00;
> }
>
> /* After adding all new pending connections, walk through
> * the list of pending reports and also add these to the
> - * white list if there is still space. Abort if space runs out.
> + * accept list if there is still space. Abort if space runs out.
> */
> list_for_each_entry(params, &hdev->pend_le_reports, action) {
> - if (add_to_white_list(req, params, &num_entries, allow_rpa))
> + if (add_to_accept_list(req, params, &num_entries, allow_rpa))
> return 0x00;
> }
>
> @@ -921,7 +921,7 @@ static u8 update_white_list(struct hci_request *req)
> hdev->interleave_scan_state != INTERLEAVE_SCAN_ALLOWLIST)
> return 0x00;
>
> - /* Select filter policy to use white list */
> + /* Select filter policy to use accept list */
> return 0x01;
> }
>
> @@ -1078,20 +1078,20 @@ void hci_req_add_le_passive_scan(struct hci_request *req)
> return;
>
> bt_dev_dbg(hdev, "interleave state %d", hdev->interleave_scan_state);
> - /* Adding or removing entries from the white list must
> + /* Adding or removing entries from the accept list must
> * happen before enabling scanning. The controller does
> - * not allow white list modification while scanning.
> + * not allow accept list modification while scanning.
> */
> - filter_policy = update_white_list(req);
> + filter_policy = update_accept_list(req);
>
> /* When the controller is using random resolvable addresses and
> * with that having LE privacy enabled, then controllers with
> * Extended Scanner Filter Policies support can now enable support
> * for handling directed advertising.
> *
> - * So instead of using filter polices 0x00 (no whitelist)
> - * and 0x01 (whitelist enabled) use the new filter policies
> - * 0x02 (no whitelist) and 0x03 (whitelist enabled).
> + * So instead of using filter polices 0x00 (no accept list)
> + * and 0x01 (accept list enabled) use the new filter policies
> + * 0x02 (no accept list) and 0x03 (accept list enabled).
> */
> if (hci_dev_test_flag(hdev, HCI_PRIVACY) &&
> (hdev->le_features[0] & HCI_LE_EXT_SCAN_POLICY))
> @@ -1127,7 +1127,8 @@ void hci_req_add_le_passive_scan(struct hci_request *req)
> interval = hdev->le_scan_interval;
> }
>
> - bt_dev_dbg(hdev, "LE passive scan with whitelist = %d", filter_policy);
> + bt_dev_dbg(hdev, "LE passive scan with accept list = %d",
> + filter_policy);
> hci_req_start_scan(req, LE_SCAN_PASSIVE, interval, window,
> own_addr_type, filter_policy, filter_dup,
> addr_resolv);
> @@ -1180,7 +1181,7 @@ static void hci_req_set_event_filter(struct hci_request *req)
> /* Always clear event filter when starting */
> hci_req_clear_event_filter(req);
>
> - list_for_each_entry(b, &hdev->whitelist, list) {
> + list_for_each_entry(b, &hdev->accept_list, list) {
> if (!hci_conn_test_flag(HCI_CONN_FLAG_REMOTE_WAKEUP,
> b->current_flags))
> continue;
> @@ -2623,11 +2624,11 @@ int hci_update_random_address(struct hci_request *req, bool require_privacy,
> return 0;
> }
>
> -static bool disconnected_whitelist_entries(struct hci_dev *hdev)
> +static bool disconnected_accept_list_entries(struct hci_dev *hdev)
> {
> struct bdaddr_list *b;
>
> - list_for_each_entry(b, &hdev->whitelist, list) {
> + list_for_each_entry(b, &hdev->accept_list, list) {
> struct hci_conn *conn;
>
> conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &b->bdaddr);
> @@ -2659,7 +2660,7 @@ void __hci_req_update_scan(struct hci_request *req)
> return;
>
> if (hci_dev_test_flag(hdev, HCI_CONNECTABLE) ||
> - disconnected_whitelist_entries(hdev))
> + disconnected_accept_list_entries(hdev))
> scan = SCAN_PAGE;
> else
> scan = SCAN_DISABLED;
> @@ -3151,7 +3152,7 @@ static int active_scan(struct hci_request *req, unsigned long opt)
> uint16_t interval = opt;
> struct hci_dev *hdev = req->hdev;
> u8 own_addr_type;
> - /* White list is not used for discovery */
> + /* Accept list is not used for discovery */
> u8 filter_policy = 0x00;
> /* Default is to enable duplicates filter */
> u8 filter_dup = LE_SCAN_FILTER_DUP_ENABLE;
> diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
> index 251b9128f530..26d794b164f1 100644
> --- a/net/bluetooth/hci_sock.c
> +++ b/net/bluetooth/hci_sock.c
> @@ -892,7 +892,7 @@ static int hci_sock_release(struct socket *sock)
> return 0;
> }
>
> -static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg)
> +static int hci_sock_reject_list_add(struct hci_dev *hdev, void __user *arg)
> {
> bdaddr_t bdaddr;
> int err;
> @@ -902,14 +902,14 @@ static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg)
>
> hci_dev_lock(hdev);
>
> - err = hci_bdaddr_list_add(&hdev->blacklist, &bdaddr, BDADDR_BREDR);
> + err = hci_bdaddr_list_add(&hdev->reject_list, &bdaddr, BDADDR_BREDR);
>
> hci_dev_unlock(hdev);
>
> return err;
> }
>
> -static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)
> +static int hci_sock_reject_list_del(struct hci_dev *hdev, void __user *arg)
> {
> bdaddr_t bdaddr;
> int err;
> @@ -919,7 +919,7 @@ static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)
>
> hci_dev_lock(hdev);
>
> - err = hci_bdaddr_list_del(&hdev->blacklist, &bdaddr, BDADDR_BREDR);
> + err = hci_bdaddr_list_del(&hdev->reject_list, &bdaddr, BDADDR_BREDR);
>
> hci_dev_unlock(hdev);
>
> @@ -959,12 +959,12 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,
> case HCIBLOCKADDR:
> if (!capable(CAP_NET_ADMIN))
> return -EPERM;
> - return hci_sock_blacklist_add(hdev, (void __user *)arg);
> + return hci_sock_reject_list_add(hdev, (void __user *)arg);
>
> case HCIUNBLOCKADDR:
> if (!capable(CAP_NET_ADMIN))
> return -EPERM;
> - return hci_sock_blacklist_del(hdev, (void __user *)arg);
> + return hci_sock_reject_list_del(hdev, (void __user *)arg);
> }
>
> return -ENOIOCTLCMD;
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index c10a45368ec2..6b0f8f7867bc 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -7662,7 +7662,7 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
> * at least ensure that we ignore incoming data from them.
> */
> if (hcon->type == LE_LINK &&
> - hci_bdaddr_list_lookup(&hcon->hdev->blacklist, &hcon->dst,
> + hci_bdaddr_list_lookup(&hcon->hdev->reject_list, &hcon->dst,
> bdaddr_dst_type(hcon))) {
> kfree_skb(skb);
> return;
> @@ -8119,7 +8119,7 @@ static void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
> dst_type = bdaddr_dst_type(hcon);
>
> /* If device is blocked, do not create channels for it */
> - if (hci_bdaddr_list_lookup(&hdev->blacklist, &hcon->dst, dst_type))
> + if (hci_bdaddr_list_lookup(&hdev->reject_list, &hcon->dst, dst_type))
> return;
>
> /* Find fixed channels and notify them of the new connection. We
> diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
> index 6adee6de1e03..f0e4ebed72b8 100644
> --- a/net/bluetooth/mgmt.c
> +++ b/net/bluetooth/mgmt.c
> @@ -4064,9 +4064,10 @@ static int get_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,
> memset(&rp, 0, sizeof(rp));
>
> if (cp->addr.type == BDADDR_BREDR) {
> - br_params = hci_bdaddr_list_lookup_with_flags(&hdev->whitelist,
> - &cp->addr.bdaddr,
> - cp->addr.type);
> + br_params =
> + hci_bdaddr_list_lookup_with_flags(&hdev->accept_list,
> + &cp->addr.bdaddr,
> + cp->addr.type);
break the 80 columns rule here.
> if (!br_params)
> goto done;
>
> @@ -4132,9 +4133,10 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,
> hci_dev_lock(hdev);
>
> if (cp->addr.type == BDADDR_BREDR) {
> - br_params = hci_bdaddr_list_lookup_with_flags(&hdev->whitelist,
> - &cp->addr.bdaddr,
> - cp->addr.type);
> + br_params =
> + hci_bdaddr_list_lookup_with_flags(&hdev->accept_list,
> + &cp->addr.bdaddr,
> + cp->addr.type);
And here as well.
Regards
Marcel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 8/8] Bluetooth: use inclusive language in comments
2021-05-31 8:37 [PATCH v2 0/8] Bluetooth: use inclusive language Archie Pusaka
` (6 preceding siblings ...)
2021-05-31 8:37 ` [PATCH v2 7/8] Bluetooth: use inclusive language when filtering devices Archie Pusaka
@ 2021-05-31 8:37 ` Archie Pusaka
2021-06-02 20:04 ` [PATCH v2 0/8] Bluetooth: use inclusive language Marcel Holtmann
8 siblings, 0 replies; 12+ messages in thread
From: Archie Pusaka @ 2021-05-31 8:37 UTC (permalink / raw)
To: linux-bluetooth, Marcel Holtmann
Cc: CrosBT Upstreaming, Archie Pusaka, Miao-chen Chou,
David S. Miller, Jakub Kicinski, Johan Hedberg,
Luiz Augusto von Dentz, Ole Bjørn Midtbø,
linux-kernel, netdev
From: Archie Pusaka <apusaka@chromium.org>
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:
slave -> peripheral
blacklisted -> blocked
Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
Changes in v2:
* Add details in commit message
net/bluetooth/hci_event.c | 6 +++---
net/bluetooth/hidp/core.c | 2 +-
net/bluetooth/mgmt.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 760e8e14e0f2..df5e17019e00 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -5404,7 +5404,7 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,
case HCI_AUTO_CONN_DIRECT:
/* Only devices advertising with ADV_DIRECT_IND are
* triggering a connection attempt. This is allowing
- * incoming connections from slave devices.
+ * incoming connections from peripheral devices.
*/
if (adv_type != LE_ADV_DIRECT_IND)
return NULL;
@@ -5412,8 +5412,8 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,
case HCI_AUTO_CONN_ALWAYS:
/* Devices advertising with ADV_IND or ADV_DIRECT_IND
* are triggering a connection attempt. This means
- * that incoming connections from slave device are
- * accepted and also outgoing connections to slave
+ * that incoming connections from peripheral device are
+ * accepted and also outgoing connections to peripheral
* devices are established when found.
*/
break;
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 0db48c812662..96fedef14723 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -794,7 +794,7 @@ static int hidp_setup_hid(struct hidp_session *session,
hid->dev.parent = &session->conn->hcon->dev;
hid->ll_driver = &hidp_hid_driver;
- /* True if device is blacklisted in drivers/hid/hid-quirks.c */
+ /* True if device is blocked in drivers/hid/hid-quirks.c */
if (hid_ignore(hid)) {
hid_destroy_device(session->hid);
session->hid = NULL;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index f0e4ebed72b8..35e3563f2a4e 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2959,7 +2959,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
/* When pairing a new device, it is expected to remember
* this device for future connections. Adding the connection
* parameter information ahead of time allows tracking
- * of the slave preferred values and will speed up any
+ * of the peripheral preferred values and will speed up any
* further connection establishment.
*
* If connection parameters already exist, then they
--
2.32.0.rc0.204.g9fa02ecfa5-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v2 0/8] Bluetooth: use inclusive language
2021-05-31 8:37 [PATCH v2 0/8] Bluetooth: use inclusive language Archie Pusaka
` (7 preceding siblings ...)
2021-05-31 8:37 ` [PATCH v2 8/8] Bluetooth: use inclusive language in comments Archie Pusaka
@ 2021-06-02 20:04 ` Marcel Holtmann
8 siblings, 0 replies; 12+ messages in thread
From: Marcel Holtmann @ 2021-06-02 20:04 UTC (permalink / raw)
To: Archie Pusaka
Cc: linux-bluetooth, CrosBT Upstreaming, Archie Pusaka,
David S. Miller, Jakub Kicinski, Johan Hedberg,
Luiz Augusto von Dentz, Miao-chen Chou,
Ole Bjørn Midtbø,
linux-kernel, netdev
Hi Archie,
> This series contains inclusive language patches, to promote usage of
> central, peripheral, reject list, and accept list. I tried to divide
> the change to several smaller patches to ease downstreamers to make
> gradual change.
>
> There are still some occurences in debugfs in which the
> original less inclusive terms is still left as-is since it is a
> file name, and I afraid replacing them will cause instability to
> other systems depending on that file name.
>
> Changes in v2:
> * Add details in commit message
> * SMP: Use initiator/responder instead of central/peripheral
> * reject/accept list: Was actually two patches, squashed together
> * Drop patches in L2CAP, RFCOMM, and debugfs
>
> Archie Pusaka (8):
> Bluetooth: use inclusive language in HCI role
> Bluetooth: use inclusive language in hci_core.h
> Bluetooth: use inclusive language to describe CPB
> Bluetooth: use inclusive language in HCI LE features
> Bluetooth: use inclusive language when tracking connections
> Bluetooth: use inclusive language in SMP
> Bluetooth: use inclusive language when filtering devices
> Bluetooth: use inclusive language in comments
>
> include/net/bluetooth/hci.h | 98 +++++++++++++-------------
> include/net/bluetooth/hci_core.h | 22 +++---
> include/net/bluetooth/mgmt.h | 2 +-
> net/bluetooth/amp.c | 2 +-
> net/bluetooth/hci_conn.c | 32 ++++-----
> net/bluetooth/hci_core.c | 46 ++++++-------
> net/bluetooth/hci_debugfs.c | 8 +--
> net/bluetooth/hci_event.c | 114 +++++++++++++++----------------
> net/bluetooth/hci_request.c | 106 ++++++++++++++--------------
> net/bluetooth/hci_sock.c | 12 ++--
> net/bluetooth/hidp/core.c | 2 +-
> net/bluetooth/l2cap_core.c | 16 ++---
> net/bluetooth/mgmt.c | 36 +++++-----
> net/bluetooth/smp.c | 86 +++++++++++------------
> net/bluetooth/smp.h | 6 +-
> 15 files changed, 297 insertions(+), 291 deletions(-)
patches 2,3,4,6,8 have been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 12+ messages in thread