2008-02-03 06:00:41

by Li Zefan

[permalink] [raw]
Subject: [PATCH] IPV4: fix compile error building without CONFIG_FS_PROC


compile error building without CONFIG_FS_PROC.

net/ipv4/fib_frontend.c: In function 'fib_net_init':
net/ipv4/fib_frontend.c:1032: error: implicit declaration of function 'fib_proc_
init'
net/ipv4/fib_frontend.c: In function 'fib_net_exit':
net/ipv4/fib_frontend.c:1047: error: implicit declaration of function 'fib_proc_
exit'

Signed-off-by: Li Zefan <[email protected]>

---
include/net/ip_fib.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 90d1175..af5e985 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -267,5 +267,13 @@ static inline void fib_res_put(struct fib_result *res)
extern int __net_init fib_proc_init(struct net *net);
extern void __net_exit fib_proc_exit(struct net *net);
#endif
+static inline int fib_proc_init(struct net *net)
+{
+ return 0;
+}
+static inline int fib_proc_exit(struct net *net)
+{
+ return 0;
+}

#endif /* _NET_FIB_H */
--
1.5.4.rc3


2008-02-04 00:48:44

by Li Zefan

[permalink] [raw]
Subject: Re: [PATCH] IPV4: fix compile error building without CONFIG_FS_PROC

compile error building without CONFIG_FS_PROC.

net/ipv4/fib_frontend.c: In function 'fib_net_init':
net/ipv4/fib_frontend.c:1032: error: implicit declaration of function 'fib_proc_
init'
net/ipv4/fib_frontend.c: In function 'fib_net_exit':
net/ipv4/fib_frontend.c:1047: error: implicit declaration of function 'fib_proc_
exit'

Signed-off-by: Li Zefan <[email protected]>

---

The exit method should have no return values...

---
include/net/ip_fib.h | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 90d1175..69393e3 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -267,5 +267,12 @@ static inline void fib_res_put(struct fib_result *res)
extern int __net_init fib_proc_init(struct net *net);
extern void __net_exit fib_proc_exit(struct net *net);
#endif
+static inline int fib_proc_init(struct net *net)
+{
+ return 0;
+}
+static inline void fib_proc_exit(struct net *net)
+{
+}

#endif /* _NET_FIB_H */
--
1.5.4.rc3

2008-02-04 02:25:00

by YOSHIFUJI Hideaki

[permalink] [raw]
Subject: Re: [PATCH] IPV4: fix compile error building without CONFIG_FS_PROC

In article <[email protected]> (at Mon, 04 Feb 2008 08:47:29 +0800), Li Zefan <[email protected]> says:

> compile error building without CONFIG_FS_PROC.
:
> The exit method should have no return values...

Have you really tested this with CONFIG_FS_PROC?

--yoshfuji

2008-02-04 03:17:30

by Li Zefan

[permalink] [raw]
Subject: Re: [PATCH] IPV4: fix compile error building without CONFIG_FS_PROC

YOSHIFUJI Hideaki wrote:
> In article <[email protected]> (at Mon, 04 Feb 2008 08:47:29 +0800), Li Zefan <[email protected]> says:
>
>> compile error building without CONFIG_FS_PROC.
> :
>> The exit method should have no return values...
>
> Have you really tested this with CONFIG_FS_PROC?
>
> --yoshfuji
>
>

Oops, shame on me, what a silly patch... :( I tested it without CONFIG_PROC_PS,
but didn't test it with CONFIG_PROC_FS.

Now I've tested the new patch both with and without CONFIG_PROC_FS.

---

compile error building without CONFIG_FS_PROC:

net/ipv4/fib_frontend.c: In function 'fib_net_init':
net/ipv4/fib_frontend.c:1032: error: implicit declaration of function 'fib_proc_
init'
net/ipv4/fib_frontend.c: In function 'fib_net_exit':
net/ipv4/fib_frontend.c:1047: error: implicit declaration of function 'fib_proc_
exit'

Signed-off-by: Li Zefan <[email protected]>

---
include/net/ip_fib.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 90d1175..8b12667 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -266,6 +266,14 @@ static inline void fib_res_put(struct fib_result *res)
#ifdef CONFIG_PROC_FS
extern int __net_init fib_proc_init(struct net *net);
extern void __net_exit fib_proc_exit(struct net *net);
+#else
+static inline int fib_proc_init(struct net *net)
+{
+ return 0;
+}
+static inline void fib_proc_exit(struct net *net)
+{
+}
#endif

#endif /* _NET_FIB_H */
--
1.5.4.rc3

2008-02-05 10:54:44

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] IPV4: fix compile error building without CONFIG_FS_PROC

From: Li Zefan <[email protected]>
Date: Mon, 04 Feb 2008 11:16:24 +0800

> compile error building without CONFIG_FS_PROC:
>
> net/ipv4/fib_frontend.c: In function 'fib_net_init':
> net/ipv4/fib_frontend.c:1032: error: implicit declaration of function 'fib_proc_
> init'
> net/ipv4/fib_frontend.c: In function 'fib_net_exit':
> net/ipv4/fib_frontend.c:1047: error: implicit declaration of function 'fib_proc_
> exit'
>
> Signed-off-by: Li Zefan <[email protected]>

Applied, thanks.