All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	Jakub Kicinski <kuba@kernel.org>,
	Johan Hedberg <johan.hedberg@gmail.com>,
	Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
	linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH 05/12] Bluetooth: use inclusive language in L2CAP
Date: Tue, 25 May 2021 18:29:34 +0800	[thread overview]
Message-ID: <20210525182900.5.I8353f22ae68a7e5ed9aaa44a692dec6d11bcb43a@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/l2cap.h | 2 +-
 net/bluetooth/l2cap_sock.c    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 3c4f550e5a8b..1f5ed6b163af 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -89,7 +89,7 @@ struct l2cap_conninfo {
 };
 
 #define L2CAP_LM	0x03
-#define L2CAP_LM_MASTER		0x0001
+#define L2CAP_LM_CENTRAL	0x0001
 #define L2CAP_LM_AUTH		0x0002
 #define L2CAP_LM_ENCRYPT	0x0004
 #define L2CAP_LM_TRUSTED	0x0008
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index c99d65ef13b1..9080d001a03a 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -503,7 +503,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,
 		}
 
 		if (test_bit(FLAG_ROLE_SWITCH, &chan->flags))
-			opt |= L2CAP_LM_MASTER;
+			opt |= L2CAP_LM_CENTRAL;
 
 		if (test_bit(FLAG_FORCE_RELIABLE, &chan->flags))
 			opt |= L2CAP_LM_RELIABLE;
@@ -807,7 +807,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
 		if (opt & L2CAP_LM_SECURE)
 			chan->sec_level = BT_SECURITY_HIGH;
 
-		if (opt & L2CAP_LM_MASTER)
+		if (opt & L2CAP_LM_CENTRAL)
 			set_bit(FLAG_ROLE_SWITCH, &chan->flags);
 		else
 			clear_bit(FLAG_ROLE_SWITCH, &chan->flags);
-- 
2.31.1.818.g46aad6cb9e-goog


  parent reply	other threads:[~2021-05-25 10:31 UTC|newest]

Thread overview: 22+ 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 11:26   ` Bluetooth: use inclusive language bluez.test.bot
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 ` Archie Pusaka [this message]
2021-05-26 15:12   ` [PATCH 05/12] Bluetooth: use inclusive language in L2CAP Marcel Holtmann
2021-05-25 10:29 ` [PATCH 06/12] Bluetooth: use inclusive language in RFCOMM Archie Pusaka
2021-05-26 15:07   ` 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.5.I8353f22ae68a7e5ed9aaa44a692dec6d11bcb43a@changeid \
    --to=apusaka@google.com \
    --cc=apusaka@chromium.org \
    --cc=chromeos-bluetooth-upstreaming@chromium.org \
    --cc=davem@davemloft.net \
    --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=mcchou@chromium.org \
    --cc=netdev@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.