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

Commit 7a7b3732 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: fix a conflict bug in wmi service bitmap 



Service mapping for main firmware branch was incorrectly used for 10.x firmware
and vice-versa.  This caused wmi_services in debugfs to print wrong values.

This fixes commit cff990ce ("ath10k: fix wmi service bitmap debug") where
for some reason there was either a conflict that wasn't resolved properly or
git had a bad day.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -2194,7 +2194,7 @@ static void ath10k_wmi_service_ready_event_rx(struct ath10k *ar, 
	ar->ath_common.regulatory.current_rd =

		__le32_to_cpu(ev->hal_reg_capabilities.eeprom_rd);



	wmi_10x_svc_map(ev->wmi_service_bitmap, svc_bmap);

	wmi_main_svc_map(ev->wmi_service_bitmap, svc_bmap);

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

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

			ev->wmi_service_bitmap, sizeof(ev->wmi_service_bitmap));
@@ -2264,7 +2264,7 @@ static void ath10k_wmi_10x_service_ready_event_rx(struct ath10k *ar, 
	ar->ath_common.regulatory.current_rd =

		__le32_to_cpu(ev->hal_reg_capabilities.eeprom_rd);



	wmi_main_svc_map(ev->wmi_service_bitmap, svc_bmap);

	wmi_10x_svc_map(ev->wmi_service_bitmap, svc_bmap);

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

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

			ev->wmi_service_bitmap, sizeof(ev->wmi_service_bitmap));