Squash to "mptcp: add a new sysctl checksum_enabled"

Update this patch as Florian suggested in the "MP_CAPABLE C flag" series. Signed-off-by: Geliang Tang <[email protected]> Signed-off-by: Matthieu Baerts <[email protected]>
multipath-tcp · May 6, 2021 · ad81f7f · ad81f7f
1 parent c8600f2
commit ad81f7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/networking/mptcp-sysctl.rst
@@ -25,7 +25,7 @@ add_addr_timeout - INTEGER (seconds)
 
 	Default: 120
 
-checksum_enabled - INTEGER
+checksum_enabled - BOOLEAN
 	Control whether DSS checksum can be enabled.
 
 	DSS checksum can be enabled if the value is nonzero. This is a

diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c
@@ -23,7 +23,7 @@ struct mptcp_pernet {
 
 	u8 mptcp_enabled;
 	unsigned int add_addr_timeout;
-	int checksum_enabled;
+	u8 checksum_enabled;
 };
 
 static struct mptcp_pernet *mptcp_get_pernet(struct net *net)
@@ -74,9 +74,11 @@ static struct ctl_table mptcp_sysctl_table[] = {
 	},
 	{
 		.procname = "checksum_enabled",
-		.maxlen = sizeof(int),
+		.maxlen = sizeof(u8),
 		.mode = 0644,
-		.proc_handler = proc_dointvec,
+		.proc_handler = proc_dou8vec_minmax,
+		.extra1       = SYSCTL_ZERO,
+		.extra2       = SYSCTL_ONE
 	},
 	{}
 };