1 files changed, 6 insertions, 3 deletions

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index ea68d3219b7e..d0f36336b6ce 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -7128,7 +7128,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
         chan->dcid = cid;
 
         if (bdaddr_type_is_le(dst_type)) {
-                bool master;
+                u8 role;
 
                 /* Convert from L2CAP channel address type to HCI address type
                  */
@@ -7137,10 +7137,13 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
                 else
                         dst_type = ADDR_LE_DEV_RANDOM;
 
-                master = !test_bit(HCI_ADVERTISING, &hdev->dev_flags);
+                if (test_bit(HCI_ADVERTISING, &hdev->dev_flags))
+                        role = HCI_ROLE_SLAVE;
+                else
+                        role = HCI_ROLE_MASTER;
 
                 hcon = hci_connect_le(hdev, dst, dst_type, chan->sec_level,
-                                      HCI_LE_CONN_TIMEOUT, master);
+                                      HCI_LE_CONN_TIMEOUT, role);
         } else {
                 u8 auth_type = l2cap_get_auth_type(chan);
                 hcon = hci_connect_acl(hdev, dst, chan->sec_level, auth_type);