Commit 573b6534 authored by Geliang Tang's avatar Geliang Tang Committed by Paolo Abeni
Browse files

mptcp: sysctl: map path_manager to pm_type 



This patch maps the newly added path manager sysctl "path_manager"
to the old one "pm_type".

	path_manager   pm_type

	"kernel"    -> MPTCP_PM_TYPE_KERNEL
	"userspace" -> MPTCP_PM_TYPE_USERSPACE
	others      -> __MPTCP_PM_TYPE_NR

It is important to add this to keep a compatibility with the now
deprecated pm_type sysctl knob.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250313-net-next-mptcp-pm-ops-intro-v1-9-f4e4a88efc50@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 595c26d1

net/mptcp/ctrl.c

+14 −1
Original line number Diff line number Diff line
@@ -200,6 +200,9 @@ static int mptcp_set_path_manager(char *path_manager, const char *name) 
static int proc_path_manager(const struct ctl_table *ctl, int write,

			     void *buffer, size_t *lenp, loff_t *ppos)

{

	struct mptcp_pernet *pernet = container_of(ctl->data,

						   struct mptcp_pernet,

						   path_manager);

	char (*path_manager)[MPTCP_PM_NAME_MAX] = ctl->data;

	char pm_name[MPTCP_PM_NAME_MAX];

	const struct ctl_table tbl = {
@@ -211,8 +214,18 @@ static int proc_path_manager(const struct ctl_table *ctl, int write, 
	strscpy(pm_name, *path_manager, MPTCP_PM_NAME_MAX);



	ret = proc_dostring(&tbl, write, buffer, lenp, ppos);

	if (write && ret == 0)

	if (write && ret == 0) {

		ret = mptcp_set_path_manager(*path_manager, pm_name);

		if (ret == 0) {

			u8 pm_type = __MPTCP_PM_TYPE_NR;



			if (strncmp(pm_name, "kernel", MPTCP_PM_NAME_MAX) == 0)

				pm_type = MPTCP_PM_TYPE_KERNEL;

			else if (strncmp(pm_name, "userspace", MPTCP_PM_NAME_MAX) == 0)

				pm_type = MPTCP_PM_TYPE_USERSPACE;

			pernet->pm_type = pm_type;

		}

	}



	return ret;

}