From ad81f7fdc6f9a33ece85a4495b78a4c1e20c1367 Mon Sep 17 00:00:00 2001 From: Geliang Tang Date: Thu, 6 May 2021 15:48:44 +0800 Subject: [PATCH] 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 Signed-off-by: Matthieu Baerts --- Documentation/networking/mptcp-sysctl.rst | 2 +- net/mptcp/ctrl.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/networking/mptcp-sysctl.rst index 901fa3e4650f2..ee06fd782465a 100644 --- 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 index 603e0c851d2d6..6c2639bb9c19f 100644 --- 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 }, {} };