Unverified Commit bd6fde5f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15058 net: let net.core.dev_weight always be non-zero 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/GTXUSVLBGAGLRKEVTTLZLA4TYCPJUIUW/ 
 
https://gitee.com/openeuler/kernel/issues/IBIFI3 
 
Link:https://gitee.com/openeuler/kernel/pulls/15058

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 6a6cc2b6 ff0ad776

net/core/sysctl_net_core.c

+4 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static int proc_do_dev_weight(struct ctl_table *table, int write, 
	int ret, weight;



	mutex_lock(&dev_weight_mutex);

	ret = proc_dointvec(table, write, buffer, lenp, ppos);

	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);

	if (!ret && write) {

		weight = READ_ONCE(weight_p);

		WRITE_ONCE(dev_rx_weight, weight * dev_weight_rx_bias);
@@ -349,6 +349,7 @@ static struct ctl_table net_core_table[] = { 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_do_dev_weight,

		.extra1		= &one,

	},

	{

		.procname	= "dev_weight_rx_bias",
@@ -356,6 +357,7 @@ static struct ctl_table net_core_table[] = { 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_do_dev_weight,

		.extra1		= &one,

	},

	{

		.procname	= "dev_weight_tx_bias",
@@ -363,6 +365,7 @@ static struct ctl_table net_core_table[] = { 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_do_dev_weight,

		.extra1		= &one,

	},

	{

		.procname	= "netdev_max_backlog",