Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 757aee0f authored Apr 24, 2013 by Johan Hedberg Committed by John W. Linville Jun 12, 2013

Bluetooth: Fix checks for LE support on LE-only controllers



LE-only controllers do not support extended features so any kind of host
feature bit checks do not make sense for them. This patch fixes code
used for both single-mode (LE-only) and dual-mode (BR/EDR/LE) to use the
HCI_LE_ENABLED flag instead of the "Host LE supported" feature bit for
LE support tests.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent add295a4

net/bluetooth/mgmt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2700,7 +2700,7 @@ static int start_discovery(struct sock sk, struct hci_dev hdev,
		break;

		case DISCOV_TYPE_LE:
		if (!lmp_host_le_capable(hdev)) {
		if (!test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
		err = cmd_status(sk, hdev->id, MGMT_OP_START_DISCOVERY,
		MGMT_STATUS_NOT_SUPPORTED);
		mgmt_pending_remove(cmd);

net/bluetooth/smp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -770,7 +770,7 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)

		BT_DBG("conn %p hcon %p level 0x%2.2x", conn, hcon, sec_level);

		if (!lmp_host_le_capable(hcon->hdev))
		if (!test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags))
		return 1;

		if (sec_level == BT_SECURITY_LOW)
		@@ -851,7 +851,7 @@ int smp_sig_channel(struct l2cap_conn conn, struct sk_buff skb)
		__u8 reason;
		int err = 0;

		if (!lmp_host_le_capable(conn->hcon->hdev)) {
		if (!test_bit(HCI_LE_ENABLED, &conn->hcon->hdev->dev_flags)) {
		err = -ENOTSUPP;
		reason = SMP_PAIRING_NOTSUPP;
		goto done;