62 lines
2.3 KiB
Diff
62 lines
2.3 KiB
Diff
From 589d6121b792a8c81fa6e7dbb7c95d52440e0753 Mon Sep 17 00:00:00 2001
|
|
From: Hao Chen <chenhao288@hisilicon.com>
|
|
Date: Mon, 27 Dec 2021 19:41:43 +0800
|
|
Subject: [PATCH 169/283] net: hns3: remove the way to set tx spare buf via
|
|
module parameter
|
|
|
|
mainline inclusion
|
|
from mainline-v5.17-rc1
|
|
commit e175eb5fb05462398452e31df5019d780badf45d
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EN3D
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e175eb5fb05462398452e31df5019d780badf45d
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
The way to set tx spare buf via module parameter is not such
|
|
convenient as the way to set it via ethtool.
|
|
|
|
So,remove the way to set tx spare buf via module parameter.
|
|
|
|
Signed-off-by: Hao Chen <chenhao288@hisilicon.com>
|
|
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Reviewed-by: Yongxin Li <liyongxin1@huawei.com>
|
|
Signed-off-by: Junxin Chen <chenjunxin1@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
index 363b92e6298c..f7f9a79d299f 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
@@ -52,10 +52,6 @@ static int debug = -1;
|
|
module_param(debug, int, 0);
|
|
MODULE_PARM_DESC(debug, " Network interface message level setting");
|
|
|
|
-static unsigned int tx_spare_buf_size;
|
|
-module_param(tx_spare_buf_size, uint, 0400);
|
|
-MODULE_PARM_DESC(tx_spare_buf_size, "Size used to allocate tx spare buffer");
|
|
-
|
|
static unsigned int tx_sgl = 1;
|
|
module_param(tx_sgl, uint, 0600);
|
|
MODULE_PARM_DESC(tx_sgl, "Minimum number of frags when using dma_map_sg() to optimize the IOMMU mapping");
|
|
@@ -745,8 +741,7 @@ static void hns3_init_tx_spare_buffer(struct hns3_enet_ring *ring)
|
|
dma_addr_t dma;
|
|
int order;
|
|
|
|
- alloc_size = tx_spare_buf_size ? tx_spare_buf_size :
|
|
- ring->tqp->handle->kinfo.tx_spare_buf_size;
|
|
+ alloc_size = ring->tqp->handle->kinfo.tx_spare_buf_size;
|
|
if (!alloc_size)
|
|
return;
|
|
|
|
--
|
|
2.34.1
|
|
|