Bluetooth: Set addr_type only when it's needed
In the hci_le_conn_complete_evt() function there's no need to set the addr_type value until it's actually needed, i.e. for the black list lookup. This patch moves the code a bit further down in the function. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
c16900cf28
commit
08853f18ea
|
@ -4193,16 +4193,16 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
conn->dst_type = irk->addr_type;
|
||||
}
|
||||
|
||||
if (conn->dst_type == ADDR_LE_DEV_PUBLIC)
|
||||
addr_type = BDADDR_LE_PUBLIC;
|
||||
else
|
||||
addr_type = BDADDR_LE_RANDOM;
|
||||
|
||||
if (ev->status) {
|
||||
hci_le_conn_failed(conn, ev->status);
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
if (conn->dst_type == ADDR_LE_DEV_PUBLIC)
|
||||
addr_type = BDADDR_LE_PUBLIC;
|
||||
else
|
||||
addr_type = BDADDR_LE_RANDOM;
|
||||
|
||||
/* Drop the connection if the device is blocked */
|
||||
if (hci_bdaddr_list_lookup(&hdev->blacklist, &conn->dst, addr_type)) {
|
||||
hci_conn_drop(conn);
|
||||
|
|
Loading…
Reference in a new issue