Commit b46e0030 authored Feb 28, 2014 by Johan Hedberg Committed by Marcel Holtmann Feb 28, 2014

Bluetooth: Fix updating connection state to BT_CONNECT too early

We shouldn't update the hci_conn state to BT_CONNECT until the moment
that we're ready to send the initiating HCI command for it. If the
connection has the BT_CONNECT state too early the code responsible for
updating the local random address may incorrectly think there's a
pending connection in progress and refuse to update the address.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent 8d97250e

net/bluetooth/hci_conn.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -588,6 +588,8 @@ static void hci_req_add_le_create_conn(struct hci_request *req,
		cp.max_ce_len = __constant_cpu_to_le16(0x0000);

		hci_req_add(req, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp);

		conn->state = BT_CONNECT;
		}

		static void stop_scan_complete(struct hci_dev *hdev, u8 status)
		@@ -689,7 +691,6 @@ struct hci_conn hci_connect_le(struct hci_dev hdev, bdaddr_t *dst,

		conn->dst_type = dst_type;

		conn->state = BT_CONNECT;
		conn->out = true;
		conn->link_mode \|= HCI_LM_MASTER;
		conn->sec_level = BT_SECURITY_LOW;