Re: ath10k: append the wmi_op_version to testmode get_version cmd

[Kalle Valo]

ryan...@qti.qualcomm.com wrote:
> From: Ryan Hsu <ryan...@qti.qualcomm.com>
> 
> QCA9xxx and QCA61x4/QCA93xx are using different wmi operation, in order
> for userspace to differentiate it, appends the wmi_op_version information
> alone with the get_version command.
> 
> Signed-off-by: Ryan Hsu <ryan...@qti.qualcomm.com>

Patch applied to ath-next branch of ath.git, thanks.

4dcb78085d56 ath10k: append the wmi_op_version to testmode get_version cmd

-- 
https://patchwork.kernel.org/patch/9699775/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

[PATCH] ath10k: append the wmi_op_version to testmode get_version cmd

[ryanhsu]

From: Ryan Hsu 

QCA9xxx and QCA61x4/QCA93xx are using different wmi operation, in order
for userspace to differentiate it, appends the wmi_op_version information
alone with the get_version command.

Signed-off-by: Ryan Hsu 
---
 drivers/net/wireless/ath/ath10k/testmode.c   | 7 +++
 drivers/net/wireless/ath/ath10k/testmode_i.h | 1 +
 2 files changed, 8 insertions(+)

diff --git a/drivers/net/wireless/ath/ath10k/testmode.c 
b/drivers/net/wireless/ath/ath10k/testmode.c
index ed85f93..eaf4a4b 100644
--- a/drivers/net/wireless/ath/ath10k/testmode.c
+++ b/drivers/net/wireless/ath/ath10k/testmode.c
@@ -137,6 +137,13 @@ static int ath10k_tm_cmd_get_version(struct ath10k *ar, 
struct nlattr *tb[])
return ret;
}
 
+   ret = nla_put_u32(skb, ATH10K_TM_ATTR_WMI_OP_VERSION,
+ ar->normal_mode_fw.fw_file.wmi_op_version);
+   if (ret) {
+   kfree_skb(skb);
+   return ret;
+   }
+
return cfg80211_testmode_reply(skb);
 }
 
diff --git a/drivers/net/wireless/ath/ath10k/testmode_i.h 
b/drivers/net/wireless/ath/ath10k/testmode_i.h
index ba81bf6..191a8f3 100644
--- a/drivers/net/wireless/ath/ath10k/testmode_i.h
+++ b/drivers/net/wireless/ath/ath10k/testmode_i.h
@@ -33,6 +33,7 @@ enum ath10k_tm_attr {
ATH10K_TM_ATTR_WMI_CMDID= 3,
ATH10K_TM_ATTR_VERSION_MAJOR= 4,
ATH10K_TM_ATTR_VERSION_MINOR= 5,
+   ATH10K_TM_ATTR_WMI_OP_VERSION   = 6,
 
/* keep last */
__ATH10K_TM_ATTR_AFTER_LAST,
-- 
1.9.1