2002-10-15 16:22:31

by Kent Yoder

Subject: LLC fix (was 2.5 token ring build fails)

When building in TR support, LLC must also be included in the kernel, not
as a module. LLC only builds correctly as a module however, due to
llc_proc_exit (__exit code) being called from llc_init in llc_main.c. The
following patch fixes this.

Please apply...

Thanks,
Kent

diff -urN linux-2.5.export/net/llc/llc_proc.c
linux-2.5.key/net/llc/llc_proc.c
--- linux-2.5.export/net/llc/llc_proc.c 2002-10-14 14:40:30.000000000 -0500
+++ linux-2.5.key/net/llc/llc_proc.c 2002-10-15 10:56:37.000000000 -0500
@@ -258,7 +258,7 @@
goto out;
}

-void __exit llc_proc_exit(void)
+void llc_proc_exit(void)
{
remove_proc_entry("socket", llc_proc_dir);
remove_proc_entry("core", llc_proc_dir);
@@ -270,7 +270,7 @@
return 0;
}

-void __exit llc_proc_exit(void)
+void llc_proc_exit(void)
{
}
#endif /* CONFIG_PROC_FS */

2002-10-15 17:50:29

by David Miller

Subject: Re: LLC fix

Already in our trees and pushed to Linus (who will hopefully
pull them soon :-)

2002-10-15 17:51:59

by Arnaldo Carvalho de Melo

Subject: Re: LLC fix

Em Tue, Oct 15, 2002 at 10:44:41AM -0700, David S. Miller escreveu:
>
> Already in our trees and pushed to Linus (who will hopefully
> pull them soon :-)

Yeah, good to know that more and more people are trying 2.5 for stuff
as uncommon as LLC and Token Ring 8) This is the third report I got,
with a patch! :-)

- Arnaldo

2002-10-15 20:13:21

by Kent Yoder

Subject: Re: LLC fix

>Already in our trees and pushed to Linus (who will hopefully
>pull them soon :-)

Excellent, thanks..

Kent