[PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[Joerg Roedel]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

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 <joro-lkml@zlug.org>

[-- Attachment #2: patch_sit_as_module --]
[-- Type: text/plain, Size: 2917 bytes --]

diff -upr -X linux-2.6.18/Documentation/dontdiff linux-2.6.18-vanilla/net/ipv6/af_inet6.c linux-2.6.18/net/ipv6/af_inet6.c
--- linux-2.6.18-vanilla/net/ipv6/af_inet6.c	2006-09-20 05:42:06.000000000 +0200
+++ linux-2.6.18/net/ipv6/af_inet6.c	2006-10-05 16:55:02.000000000 +0200
@@ -849,7 +849,6 @@ static int __init inet6_init(void)
 	err = addrconf_init();
 	if (err)
 		goto addrconf_fail;
-	sit_init();
 
 	/* Init v6 extension headers. */
 	ipv6_rthdr_init();
@@ -920,7 +919,6 @@ static void __exit inet6_exit(void)
  	raw6_proc_exit();
 #endif
 	/* Cleanup code parts. */
-	sit_cleanup();
 	ip6_flowlabel_cleanup();
 	addrconf_cleanup();
 	ip6_route_cleanup();
diff -upr -X linux-2.6.18/Documentation/dontdiff linux-2.6.18-vanilla/net/ipv6/Kconfig linux-2.6.18/net/ipv6/Kconfig
--- linux-2.6.18-vanilla/net/ipv6/Kconfig	2006-09-20 05:42:06.000000000 +0200
+++ linux-2.6.18/net/ipv6/Kconfig	2006-10-09 11:16:37.000000000 +0200
@@ -126,6 +126,19 @@ config INET6_XFRM_MODE_TUNNEL
 
 	  If unsure, say Y.
 
+config IPV6_SIT
+	tristate "IPv6: IPv6-in-IPv4 tunnel (SIT driver)"
+	depends on IPV6
+	default y
+	---help---
+	  Tunneling means encapsulating data of one protocol type within
+	  another protocol and sending it over a channel that understands the
+	  encapsulating protocol. This driver implements encapsulation of IPv6
+	  into IPv4 packets. This is useful if you want to connect two IPv6
+	  networks over an IPv4-only path.
+
+	  Saying M here will produce a module called sit.ko. If unsure, say Y.
+
 config IPV6_TUNNEL
 	tristate "IPv6: IPv6-in-IPv6 tunnel"
 	select INET6_TUNNEL
diff -upr -X linux-2.6.18/Documentation/dontdiff linux-2.6.18-vanilla/net/ipv6/Makefile linux-2.6.18/net/ipv6/Makefile
--- linux-2.6.18-vanilla/net/ipv6/Makefile	2006-09-20 05:42:06.000000000 +0200
+++ linux-2.6.18/net/ipv6/Makefile	2006-10-05 17:10:42.000000000 +0200
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_IPV6) += ipv6.o
 
-ipv6-objs :=	af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o sit.o \
+ipv6-objs :=	af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \
 		route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o raw.o \
 		protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \
 		exthdrs.o sysctl_net_ipv6.o datagram.o proc.o \
@@ -24,6 +24,7 @@ obj-$(CONFIG_INET6_XFRM_MODE_TRANSPORT) 
 obj-$(CONFIG_INET6_XFRM_MODE_TUNNEL) += xfrm6_mode_tunnel.o
 obj-$(CONFIG_NETFILTER)	+= netfilter/
 
+obj-$(CONFIG_IPV6_SIT) += sit.o
 obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
 
 obj-y += exthdrs_core.o
diff -upr -X linux-2.6.18/Documentation/dontdiff linux-2.6.18-vanilla/net/ipv6/sit.c linux-2.6.18/net/ipv6/sit.c
--- 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);

[PATCH 02/02 V3] net/ipv6: seperate sit driver to extra module (addrconf.c changes)

[Joerg Roedel]

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 <joro-lkml@zlug.org>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

[PATCH 02/02 V3] net/ipv6: seperate sit driver to extra module (addrconf.c changes)

[Joerg Roedel]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

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 <joro-lkml@zlug.org>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

[-- Attachment #2: patch_sit_as_module_addrconf --]
[-- Type: text/plain, Size: 3111 bytes --]

diff -upr -X linux-2.6.18/Documentation/dontdiff linux-2.6.18-vanilla/net/ipv6/addrconf.c linux-2.6.18/net/ipv6/addrconf.c
--- linux-2.6.18-vanilla/net/ipv6/addrconf.c	2006-09-20 05:42:06.000000000 +0200
+++ linux-2.6.18/net/ipv6/addrconf.c	2006-10-06 11:04:04.000000000 +0200
@@ -389,8 +389,10 @@ static struct inet6_dev * ipv6_add_dev(s
 	ndev->regen_timer.data = (unsigned long) ndev;
 	if ((dev->flags&IFF_LOOPBACK) ||
 	    dev->type == ARPHRD_TUNNEL ||
-	    dev->type == ARPHRD_NONE ||
-	    dev->type == ARPHRD_SIT) {
+#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)
+	    dev->type == ARPHRD_SIT ||
+#endif
+	    dev->type == ARPHRD_NONE) {
 		printk(KERN_INFO
 		       "%s: Disabled Privacy Extensions\n",
 		       dev->name);
@@ -1522,8 +1524,10 @@ addrconf_prefix_route(struct in6_addr *p
 	   This thing is done here expecting that the whole
 	   class of non-broadcast devices need not cloning.
 	 */
+#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)
 	if (dev->type == ARPHRD_SIT && (dev->flags&IFF_POINTOPOINT))
 		rtmsg.rtmsg_flags |= RTF_NONEXTHOP;
+#endif
 
 	ip6_route_add(&rtmsg, NULL, NULL, NULL);
 }
@@ -1545,6 +1549,7 @@ static void addrconf_add_mroute(struct n
 	ip6_route_add(&rtmsg, NULL, NULL, NULL);
 }
 
+#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)
 static void sit_route_add(struct net_device *dev)
 {
 	struct in6_rtmsg rtmsg;
@@ -1561,6 +1566,7 @@ static void sit_route_add(struct net_dev
 
 	ip6_route_add(&rtmsg, NULL, NULL, NULL);
 }
+#endif
 
 static void addrconf_add_lroute(struct net_device *dev)
 {
@@ -1831,6 +1837,7 @@ int addrconf_set_dstaddr(void __user *ar
 	if (dev == NULL)
 		goto err_exit;
 
+#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)
 	if (dev->type == ARPHRD_SIT) {
 		struct ifreq ifr;
 		mm_segment_t	oldfs;
@@ -1860,6 +1867,7 @@ int addrconf_set_dstaddr(void __user *ar
 			err = dev_open(dev);
 		}
 	}
+#endif
 
 err_exit:
 	rtnl_unlock();
@@ -1993,6 +2001,7 @@ int addrconf_del_ifaddr(void __user *arg
 	return err;
 }
 
+#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)
 static void sit_add_v4_addrs(struct inet6_dev *idev)
 {
 	struct inet6_ifaddr * ifp;
@@ -2061,6 +2070,7 @@ static void sit_add_v4_addrs(struct inet
 		}
         }
 }
+#endif
 
 static void init_loopback(struct net_device *dev)
 {
@@ -2124,6 +2134,7 @@ static void addrconf_dev_config(struct n
 		addrconf_add_linklocal(idev, &addr);
 }
 
+#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)
 static void addrconf_sit_config(struct net_device *dev)
 {
 	struct inet6_dev *idev;
@@ -2149,6 +2160,7 @@ static void addrconf_sit_config(struct n
 	} else
 		sit_route_add(dev);
 }
+#endif
 
 static inline int
 ipv6_inherit_linklocal(struct inet6_dev *idev, struct net_device *link_dev)
@@ -2243,9 +2255,11 @@ static int addrconf_notify(struct notifi
 		}
 
 		switch(dev->type) {
+#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)
 		case ARPHRD_SIT:
 			addrconf_sit_config(dev);
 			break;
+#endif
 		case ARPHRD_TUNNEL6:
 			addrconf_ip6_tnl_config(dev);
 			break;

Re: [PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[David Miller]

From: Joerg Roedel <joro-lkml@zlug.org>
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 <joro-lkml@zlug.org>

Applied, thanks.

Re: [PATCH 02/02 V3] net/ipv6: seperate sit driver to extra module (addrconf.c changes)

[David Miller]

From: Joerg Roedel <joro-lkml@zlug.org>
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 <joro-lkml@zlug.org>
> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

Applied, thanks a lot.

Re: [PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[Jan Dittmer]

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 <jdi@l4x.org>

--- 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");

Re: [PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[Joerg Roedel]

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 <jdi@l4x.org>
Signed-off-by: Joerg Roedel <joro-lkml@zlug.org>

> 
> --- 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");

Re: [PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[David Miller]

From: Joerg Roedel <joro-lkml@zlug.org>
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 <jdi@l4x.org>
> Signed-off-by: Joerg Roedel <joro-lkml@zlug.org>

Applied, thanks for catching this Jan.

Re: [PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[Jan Dittmer]

David Miller wrote:
> From: Joerg Roedel <joro-lkml@zlug.org>
> 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 <jdi@l4x.org>
>> Signed-off-by: Joerg Roedel <joro-lkml@zlug.org>
> 
> 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

Re: [PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[Joerg Roedel]

On Sat, Oct 14, 2006 at 01:09:39AM +0200, Jan Dittmer wrote:
> David Miller wrote:
> > From: Joerg Roedel <joro-lkml@zlug.org>
> > 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 <jdi@l4x.org>
> >> Signed-off-by: Joerg Roedel <joro-lkml@zlug.org>
> > 
> > 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

Re: [PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 894 bytes --]

Joerg Roedel wrote:
> On Sat, Oct 14, 2006 at 01:09:39AM +0200, Jan Dittmer wrote:
> 
>>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.


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 <kaber@trash.net>


[-- Attachment #2: x --]
[-- Type: text/plain, Size: 261 bytes --]

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");

Re: [PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[David Miller]

From: Patrick McHardy <kaber@trash.net>
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 <kaber@trash.net>

Would you like me to apply this or is this a temp workaround
for folks?

Re: [PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[Patrick McHardy]

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.

Re: [PATCH 01/02 V3] net/ipv6: seperate sit driver to extra module

[David Miller]

From: Patrick McHardy <kaber@trash.net>
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.