Bluetooth: use inclusive language in HCI role comments

This patch replaces some non-inclusive terms based on the appropriate
language mapping table compiled by the Bluetooth SIG:
https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf

Specifically, these terms are replaced:
master -> initiator (for smp) or central (everything else)
slave  -> responder (for smp) or peripheral (everything else)

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

Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index ea0f9cdaa6b12c127d682220a41150c4d65dfbba..2b5059a56cdaaad4ab24447d13d8e06e124957d6 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -257,7 +257,7 @@ 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.
@@ -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,7 +1119,7 @@ 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 requested to connect as peripheral use directed advertising */
        if (conn->role == HCI_ROLE_SLAVE) {
                /* If we're active scanning most controllers are unable
                 * to initiate advertising. Simply reject the attempt.

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 43c324c46c0ba28e327bf9d6ca0b9b1b4792346c..da013d485f14cd5b9b8a554dda0dd5ecd146cd2d 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2795,9 +2795,9 @@ 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 */
+                       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

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 9ebb85df4db48bb694fdebee8dc6a915e0c741c3..b76c5d00b082ee61f9c6f4c9e1772ffc27567b4d 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1691,7 +1691,7 @@ 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.

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index b9413a78993aaa05e2fea0309c365dec824b7a83..11f853d0500ff8c8c79a309a585d00e732b0e287 100644 (file)
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -909,8 +909,8 @@ 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 initiator
+        * Confirms and the responder Enters the passkey.
         */
        if (smp->method == OVERLAP) {
                if (hcon->role == HCI_ROLE_MASTER)
@@ -3083,7 +3083,7 @@ 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 */
+       /* Only initiator may initiate SMP over BR/EDR */
        if (hcon->role != HCI_ROLE_MASTER)
                return;