mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-20 10:51:27 +00:00
66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From d4342be9786373d76303dae06bb7b560d7b8f864 Mon Sep 17 00:00:00 2001
|
|
From: Lavanya Suresh <lavaks@codeaurora.org>
|
|
Date: Thu, 21 Jan 2021 21:27:14 +0530
|
|
Subject: [PATCH] ath11k: fill vdev pdev id for fwtest cmd
|
|
|
|
Update proper vdev pdev id for fwtest command.
|
|
|
|
Add null checks for vif ptr of vdev, to avoid sending fwtest
|
|
cmd when vdev is not up.
|
|
|
|
Signed-off-by: Venkateswara Naralasetty <quic_vnaralas@quicinc.com>
|
|
Signed-off-by: Lavanya Suresh <lavaks@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/ath/ath11k/testmode.c | 37 +++++++++++++++++-------------
|
|
1 file changed, 21 insertions(+), 16 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/testmode.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/testmode.c
|
|
@@ -298,13 +298,16 @@ err:
|
|
return ret;
|
|
}
|
|
|
|
-static int ath11k_tm_cmd_wmi(struct ath11k *ar, struct nlattr *tb[])
|
|
+static int ath11k_tm_cmd_wmi(struct ath11k *ar, struct nlattr *tb[],
|
|
+ struct ieee80211_vif *vif)
|
|
{
|
|
struct ath11k_pdev_wmi *wmi = ar->wmi;
|
|
struct sk_buff *skb;
|
|
+ struct ath11k_vif *arvif;
|
|
u32 cmd_id, buf_len;
|
|
- int ret;
|
|
+ int ret, tag;
|
|
void *buf;
|
|
+ u32 *ptr;
|
|
|
|
mutex_lock(&ar->conf_mutex);
|
|
|
|
@@ -322,6 +325,27 @@ static int ath11k_tm_cmd_wmi(struct ath1
|
|
buf_len = nla_len(tb[ATH11K_TM_ATTR_DATA]);
|
|
cmd_id = nla_get_u32(tb[ATH11K_TM_ATTR_WMI_CMDID]);
|
|
|
|
+ ptr = (u32 *)buf;
|
|
+ tag = FIELD_GET(WMI_TLV_TAG, *ptr);
|
|
+ ptr++;
|
|
+
|
|
+ if (tag == WMI_TAG_PDEV_SET_PARAM_CMD)
|
|
+ *ptr = ar->pdev->pdev_id;
|
|
+
|
|
+ if (ar->ab->fw_mode != ATH11K_FIRMWARE_MODE_FTM &&
|
|
+ (tag == WMI_TAG_VDEV_SET_PARAM_CMD || tag == WMI_TAG_UNIT_TEST_CMD)) {
|
|
+ if (vif) {
|
|
+ arvif = (struct ath11k_vif *)vif->drv_priv;
|
|
+ *ptr = arvif->vdev_id;
|
|
+ }
|
|
+ else {
|
|
+ ret = -EINVAL;
|
|
+ ath11k_warn(ar->ab, "vdev is not up for given vdev id, so failed to send wmi command (testmode): %d\n",
|
|
+ ret);
|
|
+ goto out;
|
|
+ }
|
|
+ }
|
|
+
|
|
ath11k_dbg(ar->ab, ATH11K_DBG_TESTMODE,
|
|
"testmode cmd wmi cmd_id %d buf %pK buf_len %d\n",
|
|
cmd_id, buf, buf_len);
|