Commit bb5ce4d0 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann

Bluetooth: Remove unnecessary checks for auto-connected devices

If a device is in the pend_le_conns list it cannot at the same time also
have the need to be notified through mgmt_device_found. By making
check_pending_le_conn return whether it found an entry or not we can
avoid unnecessary checks in process_adv_report().
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 912b42ef
...@@ -4185,18 +4185,18 @@ static void hci_le_conn_update_complete_evt(struct hci_dev *hdev, ...@@ -4185,18 +4185,18 @@ static void hci_le_conn_update_complete_evt(struct hci_dev *hdev,
} }
/* This function requires the caller holds hdev->lock */ /* This function requires the caller holds hdev->lock */
static void check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr, static bool check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr,
u8 addr_type) u8 addr_type)
{ {
struct hci_conn *conn; struct hci_conn *conn;
if (!hci_pend_le_conn_lookup(hdev, addr, addr_type)) if (!hci_pend_le_conn_lookup(hdev, addr, addr_type))
return; return false;
conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW, conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW,
HCI_AT_NO_BONDING); HCI_AT_NO_BONDING);
if (!IS_ERR(conn)) if (!IS_ERR(conn))
return; return true;
switch (PTR_ERR(conn)) { switch (PTR_ERR(conn)) {
case -EBUSY: case -EBUSY:
...@@ -4209,6 +4209,8 @@ static void check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr, ...@@ -4209,6 +4209,8 @@ static void check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr,
default: default:
BT_DBG("Failed to connect: err %ld", PTR_ERR(conn)); BT_DBG("Failed to connect: err %ld", PTR_ERR(conn));
} }
return true;
} }
static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
...@@ -4233,8 +4235,10 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, ...@@ -4233,8 +4235,10 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
bdaddr_type = irk->addr_type; bdaddr_type = irk->addr_type;
} }
if (type == LE_ADV_IND || type == LE_ADV_DIRECT_IND) if (type == LE_ADV_IND || type == LE_ADV_DIRECT_IND) {
check_pending_le_conn(hdev, bdaddr, bdaddr_type); if (check_pending_le_conn(hdev, bdaddr, bdaddr_type))
return;
}
if (!hdev->pend_le_reports) if (!hdev->pend_le_reports)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment