mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
[IPV4] fib_trie: fix proc interface
Create one iterator for walking over FIB trie, and use it for all the /proc functions. Add a /proc/net/route output for backwards compatibility with old applications. Make initialization of fib_trie same as fib_hash so no #ifdef is needed in af_inet.c Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=5209 Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
8259f16257
commit
cb7b593c2c
@@ -1248,11 +1248,6 @@ module_init(inet_init);
|
||||
/* ------------------------------------------------------------------------ */
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
#ifdef CONFIG_IP_FIB_TRIE
|
||||
extern int fib_stat_proc_init(void);
|
||||
extern void fib_stat_proc_exit(void);
|
||||
#endif
|
||||
|
||||
static int __init ipv4_proc_init(void)
|
||||
{
|
||||
int rc = 0;
|
||||
@@ -1265,19 +1260,11 @@ static int __init ipv4_proc_init(void)
|
||||
goto out_udp;
|
||||
if (fib_proc_init())
|
||||
goto out_fib;
|
||||
#ifdef CONFIG_IP_FIB_TRIE
|
||||
if (fib_stat_proc_init())
|
||||
goto out_fib_stat;
|
||||
#endif
|
||||
if (ip_misc_proc_init())
|
||||
goto out_misc;
|
||||
out:
|
||||
return rc;
|
||||
out_misc:
|
||||
#ifdef CONFIG_IP_FIB_TRIE
|
||||
fib_stat_proc_exit();
|
||||
out_fib_stat:
|
||||
#endif
|
||||
fib_proc_exit();
|
||||
out_fib:
|
||||
udp4_proc_exit();
|
||||
|
||||
Reference in New Issue
Block a user