This patch removes the driver of the IPv6-in-IPv4 tunnel driver (sit)
from the IPv6 module. It adds an option to Kconfig which makes it
possible to compile it as a seperate module.
Signed-off-by: Joerg Roedel <[email protected]>
This patch contains the changes to net/ipv6/addrconf.c to remove sit
specific code if the sit driver is not selected.
Signed-off-by: Joerg Roedel <[email protected]>
Signed-off-by: YOSHIFUJI Hideaki <[email protected]>
This patch contains the changes to net/ipv6/addrconf.c to remove sit
specific code if the sit driver is not selected.
Signed-off-by: Joerg Roedel <[email protected]>
Signed-off-by: YOSHIFUJI Hideaki <[email protected]>
From: Joerg Roedel <[email protected]>
Date: Tue, 10 Oct 2006 17:37:45 +0200
> This patch removes the driver of the IPv6-in-IPv4 tunnel driver (sit)
> from the IPv6 module. It adds an option to Kconfig which makes it
> possible to compile it as a seperate module.
>
> Signed-off-by: Joerg Roedel <[email protected]>
Applied, thanks.
From: Joerg Roedel <[email protected]>
Date: Tue, 10 Oct 2006 17:43:55 +0200
> This patch contains the changes to net/ipv6/addrconf.c to remove sit
> specific code if the sit driver is not selected.
>
> Signed-off-by: Joerg Roedel <[email protected]>
> Signed-off-by: YOSHIFUJI Hideaki <[email protected]>
Applied, thanks a lot.
This is missing the MODULE_LICENSE statements and taints the kernel upon
loading. License is obvious from the beginning of the file.
Joerg Roedel wrote:
> --- linux-2.6.18-vanilla/net/ipv6/sit.c 2006-09-20 05:42:06.000000000 +0200
> +++ linux-2.6.18/net/ipv6/sit.c 2006-10-05 16:55:02.000000000 +0200
> @@ -850,3 +850,6 @@ int __init sit_init(void)
> inet_del_protocol(&sit_protocol, IPPROTO_IPV6);
> goto out;
> }
> +
> +module_init(sit_init);
> +module_exit(sit_cleanup);
Signed-off-by: Jan Dittmer <[email protected]>
--- linux-2.6-amd64/net/ipv6/sit.c~ 2006-10-13 17:39:45.000000000 +0200
+++ linux-2.6-amd64/net/ipv6/sit.c 2006-10-13 17:39:49.000000000 +0200
@@ -853,3 +853,4 @@ int __init sit_init(void)
module_init(sit_init);
module_exit(sit_cleanup);
+MODULE_LICENSE("GPL");
On Fri, Oct 13, 2006 at 08:12:06PM +0200, Jan Dittmer wrote:
> This is missing the MODULE_LICENSE statements and taints the kernel upon
> loading. License is obvious from the beginning of the file.
Ah, ok. I forgot that. Thanks for the fix.
> Joerg Roedel wrote:
> > --- linux-2.6.18-vanilla/net/ipv6/sit.c 2006-09-20 05:42:06.000000000 +0200
> > +++ linux-2.6.18/net/ipv6/sit.c 2006-10-05 16:55:02.000000000 +0200
> > @@ -850,3 +850,6 @@ int __init sit_init(void)
> > inet_del_protocol(&sit_protocol, IPPROTO_IPV6);
> > goto out;
> > }
> > +
> > +module_init(sit_init);
> > +module_exit(sit_cleanup);
>
> Signed-off-by: Jan Dittmer <[email protected]>
Signed-off-by: Joerg Roedel <[email protected]>
>
> --- linux-2.6-amd64/net/ipv6/sit.c~ 2006-10-13 17:39:45.000000000 +0200
> +++ linux-2.6-amd64/net/ipv6/sit.c 2006-10-13 17:39:49.000000000 +0200
> @@ -853,3 +853,4 @@ int __init sit_init(void)
>
> module_init(sit_init);
> module_exit(sit_cleanup);
> +MODULE_LICENSE("GPL");
From: Joerg Roedel <[email protected]>
Date: Fri, 13 Oct 2006 21:17:45 +0200
> On Fri, Oct 13, 2006 at 08:12:06PM +0200, Jan Dittmer wrote:
> > This is missing the MODULE_LICENSE statements and taints the kernel upon
> > loading. License is obvious from the beginning of the file.
...
> > Signed-off-by: Jan Dittmer <[email protected]>
> Signed-off-by: Joerg Roedel <[email protected]>
Applied, thanks for catching this Jan.
David Miller wrote:
> From: Joerg Roedel <[email protected]>
> Date: Fri, 13 Oct 2006 21:17:45 +0200
>
>> On Fri, Oct 13, 2006 at 08:12:06PM +0200, Jan Dittmer wrote:
>>> This is missing the MODULE_LICENSE statements and taints the kernel upon
>>> loading. License is obvious from the beginning of the file.
> ...
>>> Signed-off-by: Jan Dittmer <[email protected]>
>> Signed-off-by: Joerg Roedel <[email protected]>
>
> Applied, thanks for catching this Jan.
>
Btw. is there any way to autoload the sit module or is this the
task of the distribution tools? Debian etch at least does not
automatically probe the module when trying to bring up a 6to4 tunnel.
Jan
On Sat, Oct 14, 2006 at 01:09:39AM +0200, Jan Dittmer wrote:
> David Miller wrote:
> > From: Joerg Roedel <[email protected]>
> > Date: Fri, 13 Oct 2006 21:17:45 +0200
> >
> >> On Fri, Oct 13, 2006 at 08:12:06PM +0200, Jan Dittmer wrote:
> >>> This is missing the MODULE_LICENSE statements and taints the kernel upon
> >>> loading. License is obvious from the beginning of the file.
> > ...
> >>> Signed-off-by: Jan Dittmer <[email protected]>
> >> Signed-off-by: Joerg Roedel <[email protected]>
> >
> > Applied, thanks for catching this Jan.
> >
>
> Btw. is there any way to autoload the sit module or is this the
> task of the distribution tools? Debian etch at least does not
> automatically probe the module when trying to bring up a 6to4 tunnel.
AFAIK there is no way to automatically load the driver from the kernel
space. The configuration of the tunnel devices requires the sit0 device.
But this device is installed by the sit driver. I mailed a bug report to
the Debian people and informed them about the change.
Joerg
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index b481a4d..be699f8 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -854,3 +854,4 @@ int __init sit_init(void)
module_init(sit_init);
module_exit(sit_cleanup);
MODULE_LICENSE("GPL");
+MODULE_ALIAS("sit0");
From: Patrick McHardy <[email protected]>
Date: Sun, 05 Nov 2006 23:35:07 +0100
> It would be nice to keep things working even with this built as a
> module, it took me some time to realize my IPv6 tunnel was broken
> because of the missing sit module. This module alias fixes things
> until distributions have added an appropriate alias to modprobe.conf.
>
> Signed-off-by: Patrick McHardy <[email protected]>
Would you like me to apply this or is this a temp workaround
for folks?
David Miller wrote:
> Would you like me to apply this or is this a temp workaround
> for folks?
Please apply it. I usually build things as module if possible,
which in this case caused my tunnel to break. This will
probably happen to others as well.
From: Patrick McHardy <[email protected]>
Date: Mon, 06 Nov 2006 00:38:14 +0100
> David Miller wrote:
> > Would you like me to apply this or is this a temp workaround
> > for folks?
>
> Please apply it. I usually build things as module if possible,
> which in this case caused my tunnel to break. This will
> probably happen to others as well.
Ok, done.
Thanks.