mptcp: sysctl: drop old pm_type sysctl

Old path manager sysctl "pm_type" can be replaced by the newly added
"path_manager". Drop it together with mptcp_get_pm_type() helper.

Signed-off-by: Geliang Tang <[email protected]>

Author: Geliang Tang

Documentation/networking/mptcp-sysctl.rst

@@ -72,23 +72,6 @@ enabled - BOOLEAN
 
 	Default: 1 (enabled)
 
-pm_type - INTEGER
-	Set the default path manager type to use for each new MPTCP
-	socket. In-kernel path management will control subflow
-	connections and address advertisements according to
-	per-namespace values configured over the MPTCP netlink
-	API. Userspace path management puts per-MPTCP-connection subflow
-	connection decisions and address advertisements under control of
-	a privileged userspace program, at the cost of more netlink
-	traffic to propagate all of the related events and commands.
-
-	This is a per-namespace sysctl.
-
-	* 0 - In-kernel path manager
-	* 1 - Userspace path manager
-
-	Default: 0
-
 path_manager - STRING
 	Set the default path manager name to use for each new MPTCP
 	socket. In-kernel path management will control subflow

net/mptcp/ctrl.c

@@ -18,10 +18,6 @@
 
 static int mptcp_pernet_id;
 
-#ifdef CONFIG_SYSCTL
-static int mptcp_pm_type_max = __MPTCP_PM_TYPE_MAX;
-#endif
-
 struct mptcp_pernet {
 #ifdef CONFIG_SYSCTL
 	struct ctl_table_header *ctl_table_hdr;
@@ -37,7 +33,6 @@ struct mptcp_pernet {
 	u8 mptcp_enabled;
 	u8 checksum_enabled;
 	u8 allow_join_initial_addr_port;
-	u8 pm_type;
 	char path_manager[MPTCP_PM_NAME_MAX];
 	char scheduler[MPTCP_SCHED_NAME_MAX];
 };
@@ -79,11 +74,6 @@ unsigned int mptcp_close_timeout(const struct sock *sk)
 	return mptcp_get_pernet(sock_net(sk))->close_timeout;
 }
 
-int mptcp_get_pm_type(const struct net *net)
-{
-	return mptcp_get_pernet(net)->pm_type;
-}
-
 const char *mptcp_get_path_manager(const struct net *net)
 {
 	return mptcp_get_pernet(net)->path_manager;
@@ -105,7 +95,6 @@ static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet)
 	pernet->checksum_enabled = 0;
 	pernet->allow_join_initial_addr_port = 1;
 	pernet->stale_loss_cnt = 4;
-	pernet->pm_type = MPTCP_PM_TYPE_KERNEL;
 	strscpy(pernet->path_manager, "in-kernel", sizeof(pernet->path_manager));
 	strscpy(pernet->scheduler, "default", sizeof(pernet->scheduler));
 }
@@ -257,14 +246,6 @@ static struct ctl_table mptcp_sysctl_table[] = {
 		.mode = 0644,
 		.proc_handler = proc_douintvec_minmax,
 	},
-	{
-		.procname = "pm_type",
-		.maxlen = sizeof(u8),
-		.mode = 0644,
-		.proc_handler = proc_dou8vec_minmax,
-		.extra1       = SYSCTL_ZERO,
-		.extra2       = &mptcp_pm_type_max
-	},
 	{
 		.procname = "path_manager",
 		.maxlen	= MPTCP_PM_NAME_MAX,
@@ -322,7 +303,6 @@ static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet)
 	table[i++].data = &pernet->checksum_enabled;
 	table[i++].data = &pernet->allow_join_initial_addr_port;
 	table[i++].data = &pernet->stale_loss_cnt;
-	table[i++].data = &pernet->pm_type;
 	table[i++].data = &pernet->path_manager;
 	table[i++].data = &pernet->scheduler;
 	i++; /* table[i] is for available_schedulers which is read-only info */

net/mptcp/protocol.h

@@ -693,7 +693,6 @@ int mptcp_is_checksum_enabled(const struct net *net);
 int mptcp_allow_join_id0(const struct net *net);
 unsigned int mptcp_stale_loss_cnt(const struct net *net);
 unsigned int mptcp_close_timeout(const struct sock *sk);
-int mptcp_get_pm_type(const struct net *net);
 const char *mptcp_get_path_manager(const struct net *net);
 const char *mptcp_get_scheduler(const struct net *net);