Bluetooth: use inclusive language in hci_core.h

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>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index c4b0650..4eea590 100644 (file)
--- 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;