Bluetooth: Fix check for connected state when pairing
authorJohan Hedberg <johan.hedberg@intel.com>
Wed, 30 Jul 2014 05:35:48 +0000 (08:35 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 30 Jul 2014 17:28:41 +0000 (19:28 +0200)
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>
net/bluetooth/mgmt.c

Simple merge