diff options
author | Michal Kazior <michal.kazior@tieto.com> | 2014-11-27 04:11:15 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-12-01 02:09:14 -0500 |
commit | 2a3e60d37fc662e9c3bac2f3b960062238edb2a0 (patch) | |
tree | 62137b34811751ca35961c74b970ad5647d368ed | |
parent | b22a8f49d67713899057509cbce31ea76867b156 (diff) |
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: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r-- | drivers/net/wireless/ath/ath10k/wmi.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/wmi.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 23fee9a0530a..c6c03e540747 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c | |||
@@ -2457,6 +2457,7 @@ static int ath10k_wmi_main_pull_svc_rdy_ev(struct sk_buff *skb, | |||
2457 | arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd; | 2457 | arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd; |
2458 | arg->num_mem_reqs = ev->num_mem_reqs; | 2458 | arg->num_mem_reqs = ev->num_mem_reqs; |
2459 | arg->service_map = ev->wmi_service_bitmap; | 2459 | arg->service_map = ev->wmi_service_bitmap; |
2460 | arg->service_map_len = sizeof(ev->wmi_service_bitmap); | ||
2460 | 2461 | ||
2461 | n = min_t(size_t, __le32_to_cpu(arg->num_mem_reqs), | 2462 | n = min_t(size_t, __le32_to_cpu(arg->num_mem_reqs), |
2462 | ARRAY_SIZE(arg->mem_reqs)); | 2463 | ARRAY_SIZE(arg->mem_reqs)); |
@@ -2491,6 +2492,7 @@ static int ath10k_wmi_10x_pull_svc_rdy_ev(struct sk_buff *skb, | |||
2491 | arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd; | 2492 | arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd; |
2492 | arg->num_mem_reqs = ev->num_mem_reqs; | 2493 | arg->num_mem_reqs = ev->num_mem_reqs; |
2493 | arg->service_map = ev->wmi_service_bitmap; | 2494 | arg->service_map = ev->wmi_service_bitmap; |
2495 | arg->service_map_len = sizeof(ev->wmi_service_bitmap); | ||
2494 | 2496 | ||
2495 | n = min_t(size_t, __le32_to_cpu(arg->num_mem_reqs), | 2497 | n = min_t(size_t, __le32_to_cpu(arg->num_mem_reqs), |
2496 | ARRAY_SIZE(arg->mem_reqs)); | 2498 | ARRAY_SIZE(arg->mem_reqs)); |
@@ -2541,7 +2543,7 @@ static void ath10k_wmi_event_service_ready(struct ath10k *ar, | |||
2541 | 2543 | ||
2542 | ath10k_debug_read_service_map(ar, svc_bmap, sizeof(svc_bmap)); | 2544 | ath10k_debug_read_service_map(ar, svc_bmap, sizeof(svc_bmap)); |
2543 | ath10k_dbg_dump(ar, ATH10K_DBG_WMI, NULL, "wmi svc: ", | 2545 | ath10k_dbg_dump(ar, ATH10K_DBG_WMI, NULL, "wmi svc: ", |
2544 | arg.service_map, sizeof(arg.service_map)); | 2546 | arg.service_map, arg.service_map_len); |
2545 | 2547 | ||
2546 | /* only manually set fw features when not using FW IE format */ | 2548 | /* only manually set fw features when not using FW IE format */ |
2547 | if (ar->fw_api == 1 && ar->fw_version_build > 636) | 2549 | if (ar->fw_api == 1 && ar->fw_version_build > 636) |
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index eb756efe17ae..b264c403e5e0 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h | |||
@@ -4576,6 +4576,7 @@ struct wmi_svc_rdy_ev_arg { | |||
4576 | __le32 eeprom_rd; | 4576 | __le32 eeprom_rd; |
4577 | __le32 num_mem_reqs; | 4577 | __le32 num_mem_reqs; |
4578 | const __le32 *service_map; | 4578 | const __le32 *service_map; |
4579 | size_t service_map_len; | ||
4579 | const struct wlan_host_mem_req *mem_reqs[WMI_MAX_MEM_REQS]; | 4580 | const struct wlan_host_mem_req *mem_reqs[WMI_MAX_MEM_REQS]; |
4580 | }; | 4581 | }; |
4581 | 4582 | ||