diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-16 01:55:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-16 01:55:56 -0700 |
| commit | a0a386a360afaf7e8b3752e1d1b3e3cedbe923c7 (patch) | |
| tree | 1f29eabd298da22e82a8b21b74fc8714df896c28 | |
| parent | f6d12408a2447a4f31ccf1fe3f8e2bc0d2ec7564 (diff) | |
| parent | 4c5bd05c00593393fd209c26d2471cf12c3198f9 (diff) | |
Merge "ath10k: append the wmi_op_version to testmode get_version cmd"
| -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 f760481026db..1a067a4ece4d 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, |