aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 3b1d2dadedc8..5f7fd410fb3b 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4263,9 +4263,8 @@ static void check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr,
4263 return; 4263 return;
4264 4264
4265connect: 4265connect:
4266 /* Request connection in master = true role */
4267 conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW, 4266 conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW,
4268 HCI_LE_AUTOCONN_TIMEOUT, true); 4267 HCI_LE_AUTOCONN_TIMEOUT, HCI_ROLE_MASTER);
4269 if (!IS_ERR(conn)) 4268 if (!IS_ERR(conn))
4270 return; 4269 return;
4271 4270
@@ -4443,7 +4442,7 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
4443 if (conn == NULL) 4442 if (conn == NULL)
4444 goto not_found; 4443 goto not_found;
4445 4444
4446 ltk = hci_find_ltk(hdev, ev->ediv, ev->rand, conn->out); 4445 ltk = hci_find_ltk(hdev, ev->ediv, ev->rand, conn->role);
4447 if (ltk == NULL) 4446 if (ltk == NULL)
4448 goto not_found; 4447 goto not_found;
4449 4448