Problem with CONFIG_SYSCTL disabled

Problem with CONFIG_SYSCTL disabled

[Marcel Holtmann]

Hi Folks,

with the latest 2.6.1-bk5 I got the following error:

	In file included from drivers/net/net_init.c:53:
	include/net/neighbour.h:216: error: parse error before "proc_handler"
	include/net/neighbour.h:216: warning: function declaration isn't a prototype

Looking for the reason it seems that I have to enable CONFIG_SYSCTL to
make this compile. The following patch introduces this problem:

	ChangeSet@1.1474.82.35, 2004-01-15 00:58:20-08:00, mashirle@us.ibm.com
	  [IPV6]: Implement MIB:ipv6InterfaceTable

Regards

Marcel

Re: Problem with CONFIG_SYSCTL disabled

[YOSHIFUJI Hideaki / 吉藤英明]

In article <1074519043.6070.93.camel@pegasus> (at Mon, 19 Jan 2004 14:30:43 +0100), Marcel Holtmann <marcel@holtmann.org> says:

> 	In file included from drivers/net/net_init.c:53:
> 	include/net/neighbour.h:216: error: parse error before "proc_handler"
> 	include/net/neighbour.h:216: warning: function declaration isn't a prototype

===== include/net/neighbour.h 1.5 vs edited =====
--- 1.5/include/net/neighbour.h	Thu Jan 15 17:58:09 2004
+++ edited/include/net/neighbour.h	Mon Jan 19 22:42:24 2004
@@ -47,9 +47,7 @@
 #include <linux/skbuff.h>
 
 #include <linux/err.h>
-#ifdef CONFIG_SYSCTL
 #include <linux/sysctl.h>
-#endif
 
 #define NUD_IN_TIMER	(NUD_INCOMPLETE|NUD_DELAY|NUD_PROBE)
 #define NUD_VALID	(NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE|NUD_PROBE|NUD_STALE|NUD_DELAY)

-- 
Hideaki YOSHIFUJI @ USAGI Project <yoshfuji@linux-ipv6.org>
GPG FP: 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA

Re: Problem with CONFIG_SYSCTL disabled

[Marcel Holtmann]

Hi,

> > 	In file included from drivers/net/net_init.c:53:
> > 	include/net/neighbour.h:216: error: parse error before "proc_handler"
> > 	include/net/neighbour.h:216: warning: function declaration isn't a prototype
> 
> ===== include/net/neighbour.h 1.5 vs edited =====
> --- 1.5/include/net/neighbour.h	Thu Jan 15 17:58:09 2004
> +++ edited/include/net/neighbour.h	Mon Jan 19 22:42:24 2004
> @@ -47,9 +47,7 @@
>  #include <linux/skbuff.h>
>  
>  #include <linux/err.h>
> -#ifdef CONFIG_SYSCTL
>  #include <linux/sysctl.h>
> -#endif
>  
>  #define NUD_IN_TIMER	(NUD_INCOMPLETE|NUD_DELAY|NUD_PROBE)
>  #define NUD_VALID	(NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE|NUD_PROBE|NUD_STALE|NUD_DELAY)

so it is not needed to wrap the inclusion of linux/sysctl.h around
#ifdef's, but why is it done so many times?

	net/core/neighbour.c
	net/ipv4/devinet.c
	net/ipv4/arp.c
	net/ipv4/route.c
	net/ipv4/netfilter/ip_conntrack_standalone.c
	net/ipv6/route.c
	net/ipv6/addrconf.c
	net/ipv6/ndisc.c
	net/ipv6/icmp.c
	net/appletalk/sysctl_net_atalk.c
	net/bridge/br_netfilter.c

Regards

Marcel

Re: Problem with CONFIG_SYSCTL disabled

[YOSHIFUJI Hideaki / 吉藤英明]

In article <1074521369.6070.99.camel@pegasus> (at Mon, 19 Jan 2004 15:09:29 +0100), Marcel Holtmann <marcel@holtmann.org> says:

> so it is not needed to wrap the inclusion of linux/sysctl.h around
> #ifdef's, but why is it done so many times?
> 
> 	net/core/neighbour.c
> 	net/ipv4/devinet.c
> 	net/ipv4/arp.c
> 	net/ipv4/route.c
> 	net/ipv4/netfilter/ip_conntrack_standalone.c
> 	net/ipv6/route.c
> 	net/ipv6/addrconf.c
> 	net/ipv6/ndisc.c
> 	net/ipv6/icmp.c
> 	net/appletalk/sysctl_net_atalk.c
> 	net/bridge/br_netfilter.c

Compilation time?

If one does not require linux/sysctl.h without CONFIG_SYSCTL,
you don't need to include it.

--yoshfuji

Re: Problem with CONFIG_SYSCTL disabled

[David S. Miller]

On Mon, 19 Jan 2004 13:06:12 -0200
Luiz Fernando Capitulino <lcapitulino@prefeitura.sp.gov.br> wrote:

> > If one does not require linux/sysctl.h without CONFIG_SYSCTL,
> > you don't need to include it.
> 
>  I take a quick look, there are other places to fix. Should it be a
> janitor task ?

Yes, it's just ugly to have these ifdefs in *.c files _if_ they can be avoided.

Meanwhile I've applied the neighbour.h fix from Yoshfuji-san.