Commit 80c24ab8 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Fix LE responder/initiator address setting 



Once directed advertising is brought into the picture simply the lack of
an hci_conn object when an le_conn_complete event occurs is no longer a
reliable indication that the responder & initiator values need to be
set based on our advertising address type.

This patch moves the code for setting these values outside of the
"if (!conn)" branch and ensures that they get set for any connection
where we are in the slave role.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 9c84d1da

net/bluetooth/hci_event.c

+14 −12
Original line number Diff line number Diff line
@@ -3864,7 +3864,12 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
							  &conn->init_addr,

							  &conn->init_addr_type);

			}

		}

	} else {

		cancel_delayed_work(&conn->le_conn_timeout);

	}



	if (!conn->out) {

		/* Set the responder (our side) address type based on

		 * the advertising address type.

		 */
@@ -3877,9 +3882,6 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		conn->init_addr_type = ev->bdaddr_type;

		bacpy(&conn->init_addr, &ev->bdaddr);

	}

	} else {

		cancel_delayed_work(&conn->le_conn_timeout);

	}



	/* Lookup the identity address from the stored connection

	 * address and address type.