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

Commit 2a3e60d3 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: fix wmi svc bitmap dbg print 



The dump print uses sizeof() but since service_map
was a mere pointer the dump was too short.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent b22a8f49

drivers/net/wireless/ath/ath10k/wmi.c

+3 −1
Original line number Diff line number Diff line
@@ -2457,6 +2457,7 @@ static int ath10k_wmi_main_pull_svc_rdy_ev(struct sk_buff *skb, 
	arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd;

	arg->num_mem_reqs = ev->num_mem_reqs;

	arg->service_map = ev->wmi_service_bitmap;

	arg->service_map_len = sizeof(ev->wmi_service_bitmap);



	n = min_t(size_t, __le32_to_cpu(arg->num_mem_reqs),

		  ARRAY_SIZE(arg->mem_reqs));
@@ -2491,6 +2492,7 @@ static int ath10k_wmi_10x_pull_svc_rdy_ev(struct sk_buff *skb, 
	arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd;

	arg->num_mem_reqs = ev->num_mem_reqs;

	arg->service_map = ev->wmi_service_bitmap;

	arg->service_map_len = sizeof(ev->wmi_service_bitmap);



	n = min_t(size_t, __le32_to_cpu(arg->num_mem_reqs),

		  ARRAY_SIZE(arg->mem_reqs));
@@ -2541,7 +2543,7 @@ static void ath10k_wmi_event_service_ready(struct ath10k *ar, 


	ath10k_debug_read_service_map(ar, svc_bmap, sizeof(svc_bmap));

	ath10k_dbg_dump(ar, ATH10K_DBG_WMI, NULL, "wmi svc: ",

			arg.service_map, sizeof(arg.service_map));

			arg.service_map, arg.service_map_len);



	/* only manually set fw features when not using FW IE format */

	if (ar->fw_api == 1 && ar->fw_version_build > 636)

drivers/net/wireless/ath/ath10k/wmi.h

+1 −0
Original line number Diff line number Diff line
@@ -4576,6 +4576,7 @@ struct wmi_svc_rdy_ev_arg { 
	__le32 eeprom_rd;

	__le32 num_mem_reqs;

	const __le32 *service_map;

	size_t service_map_len;

	const struct wlan_host_mem_req *mem_reqs[WMI_MAX_MEM_REQS];

};