[PATCH] net/ipv4/route.c: fix build error

[PATCH] net/ipv4/route.c: fix build error

[Wang Chen]

Dave, the build error keeps showing several days.


From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 27 Jul 2008 23:51:45 +0200
Subject: [PATCH] net/ipv4/route.c: fix build error

fix:

net/ipv4/route.c: In function 'ip_static_sysctl_init':
net/ipv4/route.c:3225: error: 'ipv4_route_path' undeclared (first use in this function)
net/ipv4/route.c:3225: error: (Each undeclared identifier is reported only once
net/ipv4/route.c:3225: error: for each function it appears in.)
net/ipv4/route.c:3225: error: 'ipv4_route_table' undeclared (first use in this function)

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 net/ipv4/route.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 380d647..d7bf056 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3222,7 +3222,9 @@ int __init ip_rt_init(void)
  */
 void __init ip_static_sysctl_init(void)
 {
+#ifdef CONFIG_SYSCTL
 	register_sysctl_paths(ipv4_route_path, ipv4_route_table);
+#endif
 }
 
 EXPORT_SYMBOL(__ip_select_ident);
--

Re: [PATCH] net/ipv4/route.c: fix build error

[David Miller]

From: Wang Chen <wangchen@cn.fujitsu.com>
Date: Fri, 01 Aug 2008 09:40:59 +0800

> Dave, the build error keeps showing several days.

I've applied Ingo's patch, thanks.

Re: [PATCH] net/ipv4/route.c: fix build error

[Paulius Zaleckas]

David Miller wrote:
> From: Wang Chen <wangchen@cn.fujitsu.com>
> Date: Fri, 01 Aug 2008 09:40:59 +0800
> 
>> Dave, the build error keeps showing several days.
> 
> I've applied Ingo's patch, thanks.

And after merging this patch:
[PATCH] ipv4_static_sysctl_init() should be under CONFIG_SYSCTL
author	Al Viro <viro@zeniv.linux.org.uk>
	Wed, 30 Jul 2008 10:32:52 +0000 (06:32 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Fri, 1 Aug 2008 15:25:22 +0000 (11:25 -0400)
commit	a1bc6eb4b499ae67ada9a01660010580b6569403

This function is over ifdef'ed :)

#ifdef CONFIG_SYSCTL
/*
  * We really need to sanitize the damn ipv4 init order, then all
  * this nonsense will go away.
  */
void __init ip_static_sysctl_init(void)
{
#ifdef CONFIG_SYSCTL
	register_sysctl_paths(ipv4_route_path, ipv4_route_table);
#endif
}
#endif

BR,
Paulius Zaleckas

Re: [PATCH] net/ipv4/route.c: fix build error

[David Miller]

From: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Date: Wed, 06 Aug 2008 16:04:51 +0300

> This function is over ifdef'ed :)
> 
> #ifdef CONFIG_SYSCTL
> /*
>   * We really need to sanitize the damn ipv4 init order, then all
>   * this nonsense will go away.
>   */
> void __init ip_static_sysctl_init(void)
> {
> #ifdef CONFIG_SYSCTL
> 	register_sysctl_paths(ipv4_route_path, ipv4_route_table);
> #endif
> }
> #endif

Thanks, I've gotten rid of the inner ones in my tree.