71 lines
2.9 KiB
Diff
71 lines
2.9 KiB
Diff
From 8bfab91ccbe8979e74fd89575d4bb468f1b8ed53 Mon Sep 17 00:00:00 2001
|
|
From: Huazhong Tan <tanhuazhong@huawei.com>
|
|
Date: Sat, 9 May 2020 17:27:38 +0800
|
|
Subject: [PATCH 017/283] net: hns3: modify two uncorrect macro names
|
|
|
|
mainline inclusion
|
|
from mainline-v5.8-rc1
|
|
commit 4279b4d5ec9c58f63fde23b2d86de4a1e494dc06
|
|
category: cleanup
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EJ0A
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4279b4d5ec9c58f63fde23b2d86de4a1e494dc06
|
|
|
|
--------------------------------
|
|
|
|
According to the UM, command 0x0B03 and 0x0B13 are used to
|
|
query the statistics about TX and RX, not the status, so
|
|
modifies the unsuitable macro name of these two command.
|
|
|
|
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 4 ++--
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
|
|
index c57f0ccf624f..013292889601 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
|
|
@@ -187,11 +187,11 @@ enum hclge_opcode_type {
|
|
/* TQP commands */
|
|
HCLGE_OPC_CFG_TX_QUEUE = 0x0B01,
|
|
HCLGE_OPC_QUERY_TX_POINTER = 0x0B02,
|
|
- HCLGE_OPC_QUERY_TX_STATUS = 0x0B03,
|
|
+ HCLGE_OPC_QUERY_TX_STATS = 0x0B03,
|
|
HCLGE_OPC_TQP_TX_QUEUE_TC = 0x0B04,
|
|
HCLGE_OPC_CFG_RX_QUEUE = 0x0B11,
|
|
HCLGE_OPC_QUERY_RX_POINTER = 0x0B12,
|
|
- HCLGE_OPC_QUERY_RX_STATUS = 0x0B13,
|
|
+ HCLGE_OPC_QUERY_RX_STATS = 0x0B13,
|
|
HCLGE_OPC_STASH_RX_QUEUE_LRO = 0x0B16,
|
|
HCLGE_OPC_CFG_RX_QUEUE_LRO = 0x0B17,
|
|
HCLGE_OPC_CFG_COM_TQP_QUEUE = 0x0B20,
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
index b405a9d7f365..57a8cb114e28 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
@@ -552,7 +552,7 @@ static int hclge_tqps_update_stats(struct hnae3_handle *handle)
|
|
queue = handle->kinfo.tqp[i];
|
|
tqp = container_of(queue, struct hclge_tqp, q);
|
|
/* command : HCLGE_OPC_QUERY_IGU_STAT */
|
|
- hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_QUERY_RX_STATUS,
|
|
+ hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_QUERY_RX_STATS,
|
|
true);
|
|
|
|
desc[0].data[0] = cpu_to_le32((tqp->index & 0x1ff));
|
|
@@ -572,7 +572,7 @@ static int hclge_tqps_update_stats(struct hnae3_handle *handle)
|
|
tqp = container_of(queue, struct hclge_tqp, q);
|
|
/* command : HCLGE_OPC_QUERY_IGU_STAT */
|
|
hclge_cmd_setup_basic_desc(&desc[0],
|
|
- HCLGE_OPC_QUERY_TX_STATUS,
|
|
+ HCLGE_OPC_QUERY_TX_STATS,
|
|
true);
|
|
|
|
desc[0].data[0] = cpu_to_le32((tqp->index & 0x1ff));
|
|
--
|
|
2.34.1
|
|
|