aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-30 01:35:48 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-07-30 13:28:41 -0400
commit6f78fd4bb93e17543f2f6f25112687c633c12eb7 (patch)
treebca05443bff272d4eb95ce562eff2dc20e12eb12
parent233351bd66f1fadc4a69f350a9a4422c2e3d308d (diff)
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>
-rw-r--r--net/bluetooth/mgmt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 5d18efcb8467..0b15b7618beb 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -3213,7 +3213,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
3213 conn->io_capability = cp->io_cap; 3213 conn->io_capability = cp->io_cap;
3214 cmd->user_data = conn; 3214 cmd->user_data = conn;
3215 3215
3216 if (conn->state == BT_CONNECTED && 3216 if ((conn->state == BT_CONNECTED || conn->state == BT_CONFIG) &&
3217 hci_conn_security(conn, sec_level, auth_type, true)) 3217 hci_conn_security(conn, sec_level, auth_type, true))
3218 pairing_complete(cmd, 0); 3218 pairing_complete(cmd, 0);
3219 3219