Commit 6f78fd4b authored Jul 30, 2014 by Johan Hedberg Committed by Marcel Holtmann Jul 30, 2014

Bluetooth: Fix check for connected state when pairing



Both BT_CONNECTED and BT_CONFIG state mean that we have a baseband link
available. We should therefore check for either of these when pairing
and deciding whether to call hci_conn_security() directly.

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

parent 233351bd

net/bluetooth/mgmt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3213,7 +3213,7 @@ static int pair_device(struct sock sk, struct hci_dev hdev, void *data,
		conn->io_capability = cp->io_cap;
		cmd->user_data = conn;

		if (conn->state == BT_CONNECTED &&
		if ((conn->state == BT_CONNECTED \|\| conn->state == BT_CONFIG) &&
		hci_conn_security(conn, sec_level, auth_type, true))
		pairing_complete(cmd, 0);