Bluetooth: Fix endianness handling for ext scan reports evt_type

evt_type is 16 bits and thus requires endianness conversion over HCI

Signed-off-by: Troels Nilsson <[email protected]>

Author: Tronil

subsys/bluetooth/controller/hci/hci.c

@@ -6385,7 +6385,7 @@ static void le_ext_adv_legacy_report(struct pdu_data *pdu_data,
 	sep->num_reports = 1U;
 	adv_info = (void *)(((uint8_t *)sep) + sizeof(*sep));
 
-	adv_info->evt_type = evt_type_lookup[adv->type];
+	adv_info->evt_type = sys_cpu_to_le16((uint16_t)evt_type_lookup[adv->type]);
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	if (rl_idx < ll_rl_size_get()) {
@@ -6576,7 +6576,7 @@ static void ext_adv_info_fill(uint8_t evt_type, uint8_t phy, uint8_t sec_phy,
 	sep->num_reports = 1U;
 	adv_info = (void *)(((uint8_t *)sep) + sizeof(*sep));
 
-	adv_info->evt_type = evt_type;
+	adv_info->evt_type = sys_cpu_to_le16((uint16_t)evt_type);
 
 	if (0) {
 #if defined(CONFIG_BT_CTLR_PRIVACY)

subsys/bluetooth/host/scan.c

@@ -572,8 +572,8 @@ static void create_ext_adv_info(struct bt_hci_evt_le_ext_advertising_info const
 	scan_info->rssi = evt->rssi;
 	scan_info->sid = evt->sid;
 	scan_info->interval = sys_le16_to_cpu(evt->interval);
-	scan_info->adv_type = get_adv_type(evt->evt_type);
-	scan_info->adv_props = get_adv_props_extended(evt->evt_type);
+	scan_info->adv_type = get_adv_type(sys_le16_to_cpu(evt->evt_type));
+	scan_info->adv_props = get_adv_props_extended(sys_le16_to_cpu(evt->evt_type));
 }
 
 void bt_hci_le_adv_ext_report(struct net_buf *buf)
@@ -586,6 +586,7 @@ void bt_hci_le_adv_ext_report(struct net_buf *buf)
 		struct bt_hci_evt_le_ext_advertising_info *evt;
 		struct bt_le_scan_recv_info scan_info;
 		uint16_t data_status;
+		uint16_t evt_type;
 		bool is_report_complete;
 		bool more_to_come;
 		bool is_new_advertiser;
@@ -596,11 +597,12 @@ void bt_hci_le_adv_ext_report(struct net_buf *buf)
 		}
 
 		evt = net_buf_pull_mem(buf, sizeof(*evt));
-		data_status = BT_HCI_LE_ADV_EVT_TYPE_DATA_STATUS(evt->evt_type);
+		evt_type = sys_le16_to_cpu(evt->evt_type);
+		data_status = BT_HCI_LE_ADV_EVT_TYPE_DATA_STATUS(evt_type);
 		is_report_complete = data_status == BT_HCI_LE_ADV_EVT_TYPE_DATA_STATUS_COMPLETE;
 		more_to_come = data_status == BT_HCI_LE_ADV_EVT_TYPE_DATA_STATUS_PARTIAL;
 
-		if (evt->evt_type & BT_HCI_LE_ADV_EVT_TYPE_LEGACY) {
+		if (evt_type & BT_HCI_LE_ADV_EVT_TYPE_LEGACY) {
 			/* Legacy advertising reports are complete.
 			 * Create event immediately.
 			 */