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

Commit efb2513f authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Fix discovery filter when no RSSI is available 



When no RSSI value is available then make sure that the result is
filtered out when the RSSI threshold filter is active.

This means that all Bluetooth 1.1 or earlier devices will not
report any results when using a RSSI threshold filter.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 189f6ad2

net/bluetooth/hci_event.c

+3 −2
Original line number Diff line number Diff line
@@ -2043,13 +2043,14 @@ static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		data.pscan_mode		= info->pscan_mode;

		memcpy(data.dev_class, info->dev_class, 3);

		data.clock_offset	= info->clock_offset;

		data.rssi		= 0x00;

		data.rssi		= HCI_RSSI_INVALID;

		data.ssp_mode		= 0x00;



		flags = hci_inquiry_cache_update(hdev, &data, false);



		mgmt_device_found(hdev, &info->bdaddr, ACL_LINK, 0x00,

				  info->dev_class, 0, flags, NULL, 0, NULL, 0);

				  info->dev_class, HCI_RSSI_INVALID,

				  flags, NULL, 0, NULL, 0);

	}



	hci_dev_unlock(hdev);

net/bluetooth/mgmt.c

+8 −1
Original line number Diff line number Diff line
@@ -7006,9 +7006,12 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	 * if such a RSSI threshold is specified. If a RSSI threshold has

	 * been specified, then all results with a RSSI smaller than the

	 * RSSI threshold will be dropped.

	 *

	 * For BR/EDR devices (pre 1.2) providing no RSSI during inquiry,

	 * the results are also dropped.

	 */

	if (hdev->discovery.rssi != HCI_RSSI_INVALID &&

	    rssi < hdev->discovery.rssi)

	    (rssi < hdev->discovery.rssi || rssi == HCI_RSSI_INVALID))

		return;



	/* Make sure that the buffer is big enough. The 5 extra bytes
@@ -7019,6 +7022,10 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 


	memset(buf, 0, sizeof(buf));



	/* Reset invalid RSSI to 0 to keep backwards API compliance */

	if (rssi == HCI_RSSI_INVALID)

		rssi = 0;



	bacpy(&ev->addr.bdaddr, bdaddr);

	ev->addr.type = link_to_bdaddr(link_type, addr_type);

	ev->rssi = rssi;