[2.4 patch] Re: CONFIG_ATALK cannot be compiled as a module

[2.4 patch] Re: CONFIG_ATALK cannot be compiled as a module

[Adrian Bunk]

(2.4.24)
Reply-To: 
In-Reply-To: <200404242155.06101.kiza@gmx.net>

On Sat, Apr 24, 2004 at 09:55:06PM +0200, Oliver Feiler wrote:
> Hi Adrian,
> 
> On Saturday 24 April 2004 20:23, Adrian Bunk wrote:
> 
> > > when selecting CONFIG_ATALK as a module the symbols register_snap_client
> > > and unregister_snap_client will be unresolved. As I understand it they
> > > are in net/802/psnap.c which does not get compiled when Appletalk is
> > > selected as a module. Compiling into the kernel works fine.
> > >...
> >
> > thanks for this report and sorry for the late answer.
> >
> > I wasn't able to reproduce your problem.
> >
> > Please send your .config.
> 
> Attached. Upgraded the server to 2.4.26 in the meantime and threw out 
> appletalk again since we didn't need it in the end.
> 
> A quick test with compiling it as a module produced the same unresolved 
> symbols. Unless I missed another config option to set?
> 
> I don't need to set CONFIG_DEV_APPLETALK as well, right? Regardless, just 
> tried, same effect.
> 
> Btw, I think I didn't mention earlier, the kernel is patched with i2c-2.8.3. 
> Patch generated with mkpatch from the package and applied.


The patch below that should fix it.

diffstat output:
 net/802/Makefile |   60 ++++++++++++++---------------------------------
 net/Makefile     |    2 -
 2 files changed, 20 insertions(+), 42 deletions(-)

patch description:
- net/Makefile: there might be modules in net/802/
- net/802/Makefile: deuglyfy it and make it more similar to the
                    2.6 version


> Thanks!
> 
> 	Oliver


cu
Adrian

--- linux-2.4.27-pre2-full/net/802/Makefile.old	2004-05-11 01:09:46.000000000 +0200
+++ linux-2.4.27-pre2-full/net/802/Makefile	2004-05-11 01:17:00.000000000 +0200
@@ -11,48 +11,26 @@
 
 export-objs = llc_macinit.o p8022.o psnap.o fc.o
 
-obj-y	= p8023.o
+obj-y			:= p8023.o
+
+obj-$(CONFIG_SYSCTL)	+= sysctl_net_802.o
+
+subdir-$(CONFIG_LLC)	+= transit
+obj-$(CONFIG_LLC)	+= llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
+obj-$(CONFIG_LLC)	+= p8022.o psnap.o
+
+obj-$(CONFIG_TR)	+= p8022.o psnap.o tr.o
+
+obj-$(CONFIG_NET_FC)	+=                 fc.o
+
+obj-$(CONFIG_FDDI)	+=                 fddi.o
+
+obj-$(CONFIG_HIPPI)	+=                 hippi.o
+
+obj-$(CONFIG_IPX)	+= p8022.o psnap.o
+
+obj-$(CONFIG_ATALK)	+= p8022.o psnap.o
 
-obj-$(CONFIG_SYSCTL) += sysctl_net_802.o
-obj-$(CONFIG_LLC) += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
-ifeq ($(CONFIG_SYSCTL),y)
-obj-y += sysctl_net_802.o
-endif
-
-ifeq ($(CONFIG_LLC),y)
-subdir-y += transit
-obj-y += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
-SNAP = y
-endif
-
-ifdef CONFIG_TR
-obj-y += tr.o
-	SNAP=y
-endif
-
-ifdef CONFIG_NET_FC
-obj-y += fc.o
-endif
-
-ifdef CONFIG_FDDI
-obj-y += fddi.o
-endif
-
-ifdef CONFIG_HIPPI
-obj-y += hippi.o
-endif
-
-ifdef CONFIG_IPX
-	SNAP=y
-endif
-
-ifdef CONFIG_ATALK
-	SNAP=y
-endif
-
-ifeq ($(SNAP),y)
-obj-y += p8022.o psnap.o
-endif
 
 include $(TOPDIR)/Rules.make
 
--- linux-2.4.27-pre2-full/net/Makefile.old	2004-05-11 01:43:31.000000000 +0200
+++ linux-2.4.27-pre2-full/net/Makefile	2004-05-11 01:44:02.000000000 +0200
@@ -7,7 +7,7 @@
 
 O_TARGET :=	network.o
 
-mod-subdirs :=	ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched core sctp
+mod-subdirs :=	ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched core sctp 802
 export-objs :=	netsyms.o
 
 subdir-y :=	core ethernet

Re: [2.4 patch] Re: CONFIG_ATALK cannot be compiled as a module

[David S. Miller]

On Tue, 11 May 2004 01:53:43 +0200
Adrian Bunk <bunk@fs.tum.de> wrote:

> patch description:
> - net/Makefile: there might be modules in net/802/
> - net/802/Makefile: deuglyfy it and make it more similar to the
>                     2.6 version

Applied, thanks Adrian.

Re: [2.4 patch] Re: CONFIG_ATALK cannot be compiled as a module

[Oliver Feiler]

[-- Attachment #1: signed data --]
[-- Type: text/plain, Size: 1513 bytes --]

Hi Adrian,

sorry for the late reply, didn't find time to test it earlier.

On Tuesday 11 May 2004 01:53, Adrian Bunk wrote:

> > > > when selecting CONFIG_ATALK as a module the symbols
> > > > register_snap_client and unregister_snap_client will be unresolved.
> > > > As I understand it they are in net/802/psnap.c which does not get
> > > > compiled when Appletalk is selected as a module. Compiling into the
> > > > kernel works fine.
> > > >...

> The patch below that should fix it.
>
> diffstat output:
>  net/802/Makefile |   60 ++++++++++++++---------------------------------
>  net/Makefile     |    2 -
>  2 files changed, 20 insertions(+), 42 deletions(-)
>
> patch description:
> - net/Makefile: there might be modules in net/802/
> - net/802/Makefile: deuglyfy it and make it more similar to the
>                     2.6 version

Yes, works fine. No unresolved symbols.

FWIW, the modules psnap.o and p8022.o don't export a license and taint the 
kernel:

Warning: loading /lib/modules/2.4.26/kernel/net/802/p8022.o will taint the 
kernel: no license
  See http://www.tux.org/lkml/#export-tainted for information about tainted 
modules
Module p8022 loaded, with warnings
Warning: loading /lib/modules/2.4.26/kernel/net/802/psnap.o will taint the 
kernel: no license
Module psnap loaded, with warnings
Module appletalk loaded, with warnings


Other than that it works for me. Thanks for your help!

	Oliver

-- 
Oliver Feiler  -  http://kiza.kcore.de/

[-- Attachment #2: signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

[2.4 patch] net/802/{p8022,psnap}.c: add MODULE_LICENSE

[Adrian Bunk]

On Wed, May 19, 2004 at 12:27:42PM +0200, Oliver Feiler wrote:

> Hi Adrian,

Hi Oliver,

>...
> Yes, works fine. No unresolved symbols.

thanks for the confirmation, and also thanks for this report.

> FWIW, the modules psnap.o and p8022.o don't export a license and taint the 
> kernel:
>...

A fix is below (stolen from 2.6 ;-) ).

> 	Oliver

cu
Adrian

--- linux-2.4.27-pre2-full/net/802/p8022.c.old	2004-05-19 19:47:59.000000000 +0200
+++ linux-2.4.27-pre2-full/net/802/p8022.c	2004-05-19 19:51:42.000000000 +0200
@@ -142,3 +142,5 @@
 
 	restore_flags(flags);
 }
+
+MODULE_LICENSE("GPL");
--- linux-2.4.27-pre2-full/net/802/psnap.c.old	2004-05-19 19:52:22.000000000 +0200
+++ linux-2.4.27-pre2-full/net/802/psnap.c	2004-05-19 19:52:33.000000000 +0200
@@ -152,3 +152,5 @@
 
 	restore_flags(flags);
 }
+
+MODULE_LICENSE("GPL");

Re: [2.4 patch] net/802/{p8022,psnap}.c: add MODULE_LICENSE

[David S. Miller]

Applied, thanks Adrian.