diff options
| author |   Ryan Hsu <ryanhsu@qti.qualcomm.com> | 2017-04-25 14:19:16 -0700 |
|---|---|---|
| committer |   Kalle Valo <kvalo@qca.qualcomm.com> | 2017-05-04 15:59:48 +0300 |
| commit | 4dcb78085d569438e9616bf86d2a64e1acdc5e4a (patch) | |
| tree | 94db15b176b487af057cf52bffe0fd0828529445 | |
| parent | ath10k: fix out of bounds access to local buffer (diff) | |
| download | linux-dev-4dcb78085d569438e9616bf86d2a64e1acdc5e4a.tar.xz linux-dev-4dcb78085d569438e9616bf86d2a64e1acdc5e4a.zip | |
ath10k: append the wmi_op_version to testmode get_version cmd
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 <ryanhsu@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/testmode.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/testmode_i.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath10k/testmode.c b/drivers/net/wireless/ath/ath10k/testmode.c index d8564624415c..9d3eb258ac2f 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 ba81bf66ce85..191a8f34c8ea 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, |