From: Johan Hedberg Date: Wed, 30 Jul 2014 05:35:48 +0000 (+0300) Subject: Bluetooth: Fix check for connected state when pairing X-Git-Tag: v4.9.8~5959^2~12^2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f78fd4bb93e17543f2f6f25112687c633c12eb7;p=platform%2Fkernel%2Flinux-rpi3.git 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 Signed-off-by: Marcel Holtmann --- diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 5d18efcb..0b15b76 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, 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);