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

Bluetooth: Add scan_rsp parameter to mgmt_device_found() 



In preparation for being able to merge ADV_IND/ADV_SCAN_IND and SCAN_RSP
together into a single device found event add a second parameter to the
mgmt_device_found function. For now all callers pass NULL as this
parameters since we don't yet have storing of the last received
advertising report.

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

include/net/bluetooth/hci_core.h

+3 −2
Original line number Diff line number Diff line
@@ -1264,8 +1264,9 @@ void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192, 
				       u8 *randomizer192, u8 *hash256,

				       u8 *randomizer256, u8 status);

void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

		       u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name,

		       u8 ssp, u8 *eir, u16 eir_len);

		       u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name, u8

		       ssp, u8 *eir, u16 eir_len, u8 *scan_rsp,

		       u8 scan_rsp_len);

void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

		      u8 addr_type, s8 rssi, u8 *name, u8 name_len);

void mgmt_discovering(struct hci_dev *hdev, u8 discovering);

net/bluetooth/hci_event.c

+5 −5
Original line number Diff line number Diff line
@@ -1827,7 +1827,7 @@ static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		name_known = hci_inquiry_cache_update(hdev, &data, false, &ssp);

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

				  info->dev_class, 0, !name_known, ssp, NULL,

				  0);

				  0, NULL, 0);

	}



	hci_dev_unlock(hdev);
@@ -3102,7 +3102,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, 
							      false, &ssp);

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

					  info->dev_class, info->rssi,

					  !name_known, ssp, NULL, 0);

					  !name_known, ssp, NULL, 0, NULL, 0);

		}

	} else {

		struct inquiry_info_with_rssi *info = (void *) (skb->data + 1);
@@ -3120,7 +3120,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, 
							      false, &ssp);

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

					  info->dev_class, info->rssi,

					  !name_known, ssp, NULL, 0);

					  !name_known, ssp, NULL, 0, NULL, 0);

		}

	}
@@ -3309,7 +3309,7 @@ static void hci_extended_inquiry_result_evt(struct hci_dev *hdev, 
		eir_len = eir_get_length(info->data, sizeof(info->data));

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

				  info->dev_class, info->rssi, !name_known,

				  ssp, info->data, eir_len);

				  ssp, info->data, eir_len, NULL, 0);

	}



	hci_dev_unlock(hdev);
@@ -3972,7 +3972,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, 
	}



	mgmt_device_found(hdev, bdaddr, LE_LINK, bdaddr_type, NULL, rssi, 0, 1,

			  data, len);

			  data, len, NULL, 0);

}



static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)

net/bluetooth/mgmt.c

+11 −5
Original line number Diff line number Diff line
@@ -5669,7 +5669,8 @@ void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192, 


void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

		       u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name, u8

		       ssp, u8 *eir, u16 eir_len)

		       ssp, u8 *eir, u16 eir_len, u8 *scan_rsp,

		       u8 scan_rsp_len)

{

	char buf[512];

	struct mgmt_ev_device_found *ev = (void *) buf;
@@ -5679,8 +5680,10 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	if (!hci_discovery_active(hdev))

		return;



	/* Leave 5 bytes for a potential CoD field */

	if (sizeof(*ev) + eir_len + 5 > sizeof(buf))

	/* Make sure that the buffer is big enough. The 5 extra bytes

	 * are for the potential CoD field.

	 */

	if (sizeof(*ev) + eir_len + scan_rsp_len + 5 > sizeof(buf))

		return;



	memset(buf, 0, sizeof(buf));
@@ -5707,8 +5710,11 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
		eir_len = eir_append_data(ev->eir, eir_len, EIR_CLASS_OF_DEV,

					  dev_class, 3);



	ev->eir_len = cpu_to_le16(eir_len);

	ev_size = sizeof(*ev) + eir_len;

	if (scan_rsp_len > 0)

		memcpy(ev->eir + eir_len, scan_rsp, scan_rsp_len);



	ev->eir_len = cpu_to_le16(eir_len + scan_rsp_len);

	ev_size = sizeof(*ev) + eir_len + scan_rsp_len;



	mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, ev_size, NULL);

}