| Message ID | 20210525182900.5.I8353f22ae68a7e5ed9aaa44a692dec6d11bcb43a@changeid |
|---|---|
| State | New |
| Headers | show |
| Series | [01/12] Bluetooth: use inclusive language in HCI role | expand |
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/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 same as with the RFCOMM change, this is something I am not prepared to do right now since it touches API. Regards Marcel
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);