Commit 72279d17 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Marcel Holtmann
Browse files

Bluetooth: hci_event: Rework hci_inquiry_result_with_rssi_evt 



This rework the handling of hci_inquiry_result_with_rssi_evt to not use
a union to represent the different inquiry responses.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Tested-by: default avatarSoenke Huster <soenke.huster@eknoes.de>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 3318ae23

include/net/bluetooth/hci.h

+1 −5
Original line number Diff line number Diff line
@@ -2233,11 +2233,7 @@ struct inquiry_info_rssi_pscan { 
} __packed;

struct hci_ev_inquiry_result_rssi {

	__u8     num;

	struct inquiry_info_rssi info[];

} __packed;

struct hci_ev_inquiry_result_rssi_pscan {

	__u8     num;

	struct inquiry_info_rssi_pscan info[];

	__u8     data[];

} __packed;



#define HCI_EV_REMOTE_EXT_FEATURES	0x23

net/bluetooth/hci_event.c

+9 −10
Original line number Diff line number Diff line
@@ -4507,16 +4507,13 @@ static void hci_pscan_rep_mode_evt(struct hci_dev *hdev, void *data, 
static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata,

					     struct sk_buff *skb)

{

	union {

		struct hci_ev_inquiry_result_rssi *res1;

		struct hci_ev_inquiry_result_rssi_pscan *res2;

	} *ev = edata;

	struct hci_ev_inquiry_result_rssi *ev = edata;

	struct inquiry_data data;

	int i;



	bt_dev_dbg(hdev, "num_rsp %d", ev->res1->num);

	bt_dev_dbg(hdev, "num_rsp %d", ev->num);



	if (!ev->res1->num)

	if (!ev->num)

		return;



	if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))
@@ -4524,10 +4521,11 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata, 


	hci_dev_lock(hdev);



	if (skb->len == flex_array_size(ev, res2->info, ev->res2->num)) {

	if (skb->len == array_size(ev->num,

				   sizeof(struct inquiry_info_rssi_pscan))) {

		struct inquiry_info_rssi_pscan *info;



		for (i = 0; i < ev->res2->num; i++) {

		for (i = 0; i < ev->num; i++) {

			u32 flags;



			info = hci_ev_skb_pull(hdev, skb,
@@ -4554,10 +4552,11 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata, 
					  info->dev_class, info->rssi,

					  flags, NULL, 0, NULL, 0);

		}

	} else if (skb->len == flex_array_size(ev, res1->info, ev->res1->num)) {

	} else if (skb->len == array_size(ev->num,

					  sizeof(struct inquiry_info_rssi))) {

		struct inquiry_info_rssi *info;



		for (i = 0; i < ev->res1->num; i++) {

		for (i = 0; i < ev->num; i++) {

			u32 flags;



			info = hci_ev_skb_pull(hdev, skb,