[PATCH net-next] sysctl net: Remove macro checks for CONFIG_SYSCTL

Denis Kirjanov posted 1 patch 1 year ago
There is a newer version of this series
net/dccp/sysctl.c        | 4 ----
net/llc/sysctl_net_llc.c | 4 ----
2 files changed, 8 deletions(-)
[PATCH net-next] sysctl net: Remove macro checks for CONFIG_SYSCTL
Posted by Denis Kirjanov 1 year ago
Since dccp and llc makefiles already check sysctl code
compilation witn xxx-$(CONFIG_SYSCTL)
we can drop the checks

Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
---
 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
-
 /* 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",
-- 
2.43.0
Re: [PATCH net-next] sysctl net: Remove macro checks for CONFIG_SYSCTL
Posted by Simon Horman 1 year ago
On Fri, Jan 17, 2025 at 03:41:36PM +0300, Denis Kirjanov wrote:
> Since dccp and llc makefiles already check sysctl code
> compilation witn xxx-$(CONFIG_SYSCTL)

nit: with

> we can drop the checks
> 
> Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>

Reviewed-by: Simon Horman <horms@kernel.org>