Просмотр исходного кода

qcacld-3.0: Add correct vdev id check for unit test command

The correct vdev id check for the unit test command uses the vdev id
from adapter. Use the vdev id to check to do so correctly.

Change-Id: Ie36d01219b78dcb08cef0b792fe7eb9a7d4e7e55
CRs-Fixed: 2969464
Alan Chen 3 лет назад
Родитель
Сommit
caa920e2fb
2 измененных файлов с 10 добавлено и 4 удалено
  1. 8 2
      core/hdd/src/wlan_hdd_sysfs_unit_test.c
  2. 2 2
      core/hdd/src/wlan_hdd_wext.c

+ 8 - 2
core/hdd/src/wlan_hdd_sysfs_unit_test.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -41,6 +41,7 @@ static ssize_t __hdd_sysfs_unit_test_target_store(
 	char *sptr, *token;
 	uint32_t apps_args[WMA_MAX_NUM_ARGS];
 	int module_id, args_num, ret, i;
+	uint8_t vdev_id = 0;
 	QDF_STATUS status;
 
 	if (hdd_validate_adapter(adapter))
@@ -105,7 +106,12 @@ static ssize_t __hdd_sysfs_unit_test_target_store(
 			return -EINVAL;
 	}
 
-	status = sme_send_unit_test_cmd(adapter->vdev_id,
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam())
+		vdev_id = 0;
+	else
+		vdev_id = adapter->vdev_id;
+
+	status = sme_send_unit_test_cmd(vdev_id,
 					module_id,
 					args_num,
 					&apps_args[0]);

+ 2 - 2
core/hdd/src/wlan_hdd_wext.c

@@ -7129,8 +7129,8 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
 		else
 			vdev_id = adapter->vdev_id;
 
-		if (adapter->vdev_id >= WLAN_MAX_VDEVS) {
-			hdd_err_rl("Invalid vdev id");
+		if (vdev_id >= WLAN_MAX_VDEVS) {
+			hdd_err_rl("Invalid vdev id %d", vdev_id);
 			return -EINVAL;
 		}