lkml.org 
[lkml]   [2021]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
Subject[PATCH 06/12] Bluetooth: use inclusive language in RFCOMM
From
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
\
 
 \ /
  Last update: 2021-05-25 12:31    [W:0.225 / U:0.404 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site