From: Archie Pusaka <apusaka@google.com>
To: linux-bluetooth <linux-bluetooth@vger.kernel.org>,
Marcel Holtmann <marcel@holtmann.org>
Cc: CrosBT Upstreaming <chromeos-bluetooth-upstreaming@chromium.org>,
Archie Pusaka <apusaka@chromium.org>,
Miao-chen Chou <mcchou@chromium.org>,
"David S. Miller" <davem@davemloft.net>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Jakub Kicinski <kuba@kernel.org>,
Johan Hedberg <johan.hedberg@gmail.com>,
Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
Matthieu Baerts <matthieu.baerts@tessares.net>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Stefan Schmidt <stefan@datenfreihafen.org>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH 06/12] Bluetooth: use inclusive language in RFCOMM
Date: Tue, 25 May 2021 18:29:35 +0800 [thread overview]
Message-ID: <20210525182900.6.Id35872ce1572f18e0792e6f4d70721132e97a480@changeid> (raw)
In-Reply-To: <20210525102941.3958649-1-apusaka@google.com>
From: Archie Pusaka <apusaka@chromium.org>
Use "central" and "peripheral".
Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
include/net/bluetooth/rfcomm.h | 2 +-
net/bluetooth/rfcomm/sock.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
index 99d26879b02a..6472ec0053b9 100644
--- a/include/net/bluetooth/rfcomm.h
+++ b/include/net/bluetooth/rfcomm.h
@@ -290,7 +290,7 @@ struct rfcomm_conninfo {
};
#define RFCOMM_LM 0x03
-#define RFCOMM_LM_MASTER 0x0001
+#define RFCOMM_LM_CENTRAL 0x0001
#define RFCOMM_LM_AUTH 0x0002
#define RFCOMM_LM_ENCRYPT 0x0004
#define RFCOMM_LM_TRUSTED 0x0008
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index ae6f80730561..b02d0e8a7030 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -674,7 +674,7 @@ static int rfcomm_sock_setsockopt_old(struct socket *sock, int optname,
if (opt & RFCOMM_LM_SECURE)
rfcomm_pi(sk)->sec_level = BT_SECURITY_HIGH;
- rfcomm_pi(sk)->role_switch = (opt & RFCOMM_LM_MASTER);
+ rfcomm_pi(sk)->role_switch = (opt & RFCOMM_LM_CENTRAL);
break;
default:
@@ -794,7 +794,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u
}
if (rfcomm_pi(sk)->role_switch)
- opt |= RFCOMM_LM_MASTER;
+ opt |= RFCOMM_LM_CENTRAL;
if (put_user(opt, (u32 __user *) optval))
err = -EFAULT;
--
2.31.1.818.g46aad6cb9e-goog
next prev parent reply other threads:[~2021-05-25 10:31 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-25 10:29 [PATCH 00/12] Bluetooth: use inclusive language Archie Pusaka
2021-05-25 10:29 ` [PATCH 01/12] Bluetooth: use inclusive language in HCI role Archie Pusaka
2021-05-25 10:29 ` [PATCH 02/12] Bluetooth: use inclusive language in hci_core.h Archie Pusaka
2021-05-25 10:29 ` [PATCH 03/12] Bluetooth: use inclusive language to describe CPB Archie Pusaka
2021-05-25 10:29 ` [PATCH 04/12] Bluetooth: use inclusive language in HCI LE features Archie Pusaka
2021-05-25 10:29 ` [PATCH 05/12] Bluetooth: use inclusive language in L2CAP Archie Pusaka
2021-05-26 15:12 ` Marcel Holtmann
2021-05-25 10:29 ` Archie Pusaka [this message]
2021-05-26 15:07 ` [PATCH 06/12] Bluetooth: use inclusive language in RFCOMM Marcel Holtmann
2021-05-31 8:44 ` Archie Pusaka
2021-05-25 10:29 ` [PATCH 07/12] Bluetooth: use inclusive language when tracking connections Archie Pusaka
2021-05-25 10:29 ` [PATCH 08/12] Bluetooth: use inclusive language in SMP Archie Pusaka
2021-05-25 10:29 ` [PATCH 09/12] Bluetooth: use inclusive language in debugfs Archie Pusaka
2021-05-26 15:09 ` Marcel Holtmann
2021-05-25 10:29 ` [PATCH 10/12] Bluetooth: use inclusive language when filtering devices out Archie Pusaka
2021-05-26 15:11 ` Marcel Holtmann
2021-05-25 10:29 ` [PATCH 11/12] Bluetooth: use inclusive language when filtering devices in Archie Pusaka
2021-05-25 10:29 ` [PATCH 12/12] Bluetooth: use inclusive language in comments Archie Pusaka
2021-05-25 12:18 ` [PATCH 00/12] Bluetooth: use inclusive language Emil Lenngren
2021-05-25 14:34 ` Archie Pusaka
2021-05-25 15:17 ` Emil Lenngren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210525182900.6.Id35872ce1572f18e0792e6f4d70721132e97a480@changeid \
--to=apusaka@google.com \
--cc=apusaka@chromium.org \
--cc=bigeasy@linutronix.de \
--cc=chromeos-bluetooth-upstreaming@chromium.org \
--cc=davem@davemloft.net \
--cc=gustavoars@kernel.org \
--cc=johan.hedberg@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
--cc=marcel@holtmann.org \
--cc=matthieu.baerts@tessares.net \
--cc=mcchou@chromium.org \
--cc=netdev@vger.kernel.org \
--cc=stefan@datenfreihafen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).