diff options
| author | Michal Kazior <michal.kazior@tieto.com> | 2014-08-19 15:22:32 +0400 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-08-25 12:21:49 +0400 |
| commit | 7a7b37328864286d0079d03198260e5f92d0a512 (patch) | |
| tree | a48c8a1dafca4ff9119ee141f341afd67f858e91 /drivers/net | |
| parent | 10d49878971852111b49f59f6f56c3641b691173 (diff) | |
| download | linux-7a7b37328864286d0079d03198260e5f92d0a512.tar.xz | |
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 cff990ce7ddd6 ("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: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/wmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 23acbadeb8fa..ec3bf4e00b4d 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -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)); |