| Message ID | 20250119134254.19250-1-kirjanov@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,net-next] sysctl net: Remove macro checks for CONFIG_SYSCTL | expand |
On Sun, Jan 19, 2025 at 9:44 PM Denis Kirjanov <kirjanov@gmail.com> wrote: > > Since dccp and llc makefiles already check sysctl code > compilation with xxx-$(CONFIG_SYSCTL) > we can drop the checks > > Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> > --- > changelog: > v2: fix the spelling mistake "witn" -> "with" > > net/dccp/sysctl.c | 4 ---- > net/llc/sysctl_net_llc.c | 4 ---- > 2 files changed, 8 deletions(-) > > diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c > index 3fc474d6e57d..b15845fd6300 100644 > --- a/net/dccp/sysctl.c > +++ b/net/dccp/sysctl.c > @@ -11,10 +11,6 @@ > #include "dccp.h" > #include "feat.h" > > -#ifndef CONFIG_SYSCTL > -#error This file should not be compiled without CONFIG_SYSCTL defined > -#endif > - I'd like to know if you're still using DCCP since as far as I know it will soon be deprecated... If not, the whole code will be removed. Please take a look at the commit: commit b144fcaf46d43b1471ad6e4de66235b8cebb3c87 Author: Kuniyuki Iwashima <kuniyu@amazon.com> Date: Wed Jun 14 12:47:05 2023 -0700 dccp: Print deprecation notice. DCCP was marked as Orphan in the MAINTAINERS entry 2 years ago in commit 054c4610bd05 ("MAINTAINERS: dccp: move Gerrit Renker to CREDITS"). It says we haven't heard from the maintainer for five years, so DCCP is not well maintained for 7 years now. Recently DCCP only receives updates for bugs, and major distros disable it by default. Removing DCCP would allow for better organisation of TCP fields to reduce the number of cache lines hit in the fast path. Let's add a deprecation notice when DCCP socket is created and schedule its removal to 2025. Thanks, Jason
diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c index 3fc474d6e57d..b15845fd6300 100644 --- a/net/dccp/sysctl.c +++ b/net/dccp/sysctl.c @@ -11,10 +11,6 @@ #include "dccp.h" #include "feat.h" -#ifndef CONFIG_SYSCTL -#error This file should not be compiled without CONFIG_SYSCTL defined -#endif - /* Boundary values */ static int u8_max = 0xFF; static unsigned long seqw_min = DCCPF_SEQ_WMIN, diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c index 72e101135f8c..c8d88e2508fc 100644 --- a/net/llc/sysctl_net_llc.c +++ b/net/llc/sysctl_net_llc.c @@ -11,10 +11,6 @@ #include <net/net_namespace.h> #include <net/llc.h> -#ifndef CONFIG_SYSCTL -#error This file should not be compiled without CONFIG_SYSCTL defined -#endif - static struct ctl_table llc2_timeout_table[] = { { .procname = "ack",
Since dccp and llc makefiles already check sysctl code compilation with xxx-$(CONFIG_SYSCTL) we can drop the checks Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> --- changelog: v2: fix the spelling mistake "witn" -> "with" net/dccp/sysctl.c | 4 ---- net/llc/sysctl_net_llc.c | 4 ---- 2 files changed, 8 deletions(-)