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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index c2ba79c8fe51..f452e44eff3c 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1073,7 +1073,7 @@ static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb)
1073 if (conn) 1073 if (conn)
1074 queue_delayed_work(hdev->workqueue, 1074 queue_delayed_work(hdev->workqueue,
1075 &conn->le_conn_timeout, 1075 &conn->le_conn_timeout,
1076 HCI_LE_CONN_TIMEOUT); 1076 conn->conn_timeout);
1077 } 1077 }
1078 1078
1079 mgmt_advertising(hdev, *sent); 1079 mgmt_advertising(hdev, *sent);
@@ -1913,7 +1913,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, u8 status)
1913 if (cp->filter_policy == HCI_LE_USE_PEER_ADDR) 1913 if (cp->filter_policy == HCI_LE_USE_PEER_ADDR)
1914 queue_delayed_work(conn->hdev->workqueue, 1914 queue_delayed_work(conn->hdev->workqueue,
1915 &conn->le_conn_timeout, 1915 &conn->le_conn_timeout,
1916 HCI_LE_CONN_TIMEOUT); 1916 conn->conn_timeout);
1917 1917
1918unlock: 1918unlock:
1919 hci_dev_unlock(hdev); 1919 hci_dev_unlock(hdev);
@@ -4238,7 +4238,7 @@ static bool check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr,
4238 return false; 4238 return false;
4239 4239
4240 conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW, 4240 conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW,
4241 HCI_AT_NO_BONDING); 4241 HCI_AT_NO_BONDING, HCI_LE_AUTOCONN_TIMEOUT);
4242 if (!IS_ERR(conn)) 4242 if (!IS_ERR(conn))
4243 return true; 4243 return true;
4244 4244