[06/12] Bluetooth: use inclusive language in RFCOMM

Message ID	20210525182900.6.Id35872ce1572f18e0792e6f4d70721132e97a480@changeid
State	New
Headers	show Return-Path: <netdev-owner@kernel.org> Date: Tue, 25 May 2021 18:29:35 +0800 In-Reply-To: <20210525102941.3958649-1-apusaka@google.com> Message-Id: <20210525182900.6.Id35872ce1572f18e0792e6f4d70721132e97a480@changeid> Mime-Version: 1.0 References: <20210525102941.3958649-1-apusaka@google.com> Subject: [PATCH 06/12] Bluetooth: use inclusive language in RFCOMM 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	Bluetooth: use inclusive language \| expand [00/12] Bluetooth: use inclusive language [01/12] Bluetooth: use inclusive language in HCI role [02/12] Bluetooth: use inclusive language in hci_core.h [03/12] Bluetooth: use inclusive language to describe CPB [04/12] Bluetooth: use inclusive language in HCI LE features [05/12] Bluetooth: use inclusive language in L2CAP [06/12] Bluetooth: use inclusive language in RFCOMM [07/12] Bluetooth: use inclusive language when tracking connections [08/12] Bluetooth: use inclusive language in SMP [09/12] Bluetooth: use inclusive language in debugfs [10/12] Bluetooth: use inclusive language when filtering devices out [11/12] Bluetooth: use inclusive language when filtering devices in [12/12] Bluetooth: use inclusive language in comments

Message ID

20210525182900.6.Id35872ce1572f18e0792e6f4d70721132e97a480@changeid

State

New

Headers

Date: Tue, 25 May 2021 18:29:35 +0800
In-Reply-To: <20210525102941.3958649-1-apusaka@google.com>
Message-Id: <20210525182900.6.Id35872ce1572f18e0792e6f4d70721132e97a480@changeid>
Mime-Version: 1.0
References: <20210525102941.3958649-1-apusaka@google.com>
Subject: [PATCH 06/12] Bluetooth: use inclusive language in RFCOMM
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
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Series

Bluetooth: use inclusive language | expand

Commit Message

Archie Pusaka May 25, 2021, 10:29 a.m. UTC

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(-)

Comments

Marcel Holtmann May 26, 2021, 3:07 p.m. UTC | #1

Hi Archie,

> 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

I am not planning to accept this change any time soon since this is also in the libbluetooth API.

Regards

Marcel

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;

[06/12] Bluetooth: use inclusive language in RFCOMM

Commit Message

Comments

Patch