| Message ID | 20210525182900.6.Id35872ce1572f18e0792e6f4d70721132e97a480@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Bluetooth: use inclusive language | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 12 of 12 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 24 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
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
Hi Marcel, Thanks for the reply. I have sent v2 which omits this patch. Please take a look. I am not familiar with the libbluetooth API. Could you tell me more about it? Beside this and the L2CAP change, are there any other terms replacement which can't be accepted due to the libbluetooth API? Cheers, Archie On Wed, 26 May 2021 at 23:07, Marcel Holtmann <marcel@holtmann.org> wrote: > > 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;