Skip to contentSkip to conversation

net/ipv6: seperate sit driver to extra module

RFC PATCH In review Joerg Roedel 4 participants 5 messages Oct 5, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 net/ipv6: seperate sit driver to extra module

Is there a reason why the tunnel driver for IPv6-in-IPv4 is currently compiled into the ipv6 module? This driver is only needed in gateways between different IPv6 networks. On all other hosts with ipv6 enabled it is not required. To have this driver in a seperate module will save memory on those machines.
I appended a small and trival patch to 2.6.18 which does exactly this.

Joerg

net/ipv6/af_inet6.c +0 -2
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
@@ -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();
net/ipv6/Kconfig +13 -0
diff -upr -X linux-2.6.18/Documentation/dontdiff linux-2.6.18-vanilla/net/ipv6/Kconfig linux-2.6.18/net/ipv6/Kconfig
@@ -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 n
+	---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 usefull 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 N.
+
 config IPV6_TUNNEL
 	tristate "IPv6: IPv6-in-IPv6 tunnel"
 	select INET6_TUNNEL
net/ipv6/Makefile +2 -1
diff -upr -X linux-2.6.18/Documentation/dontdiff linux-2.6.18-vanilla/net/ipv6/Makefile linux-2.6.18/net/ipv6/Makefile
@@ -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
net/ipv6/sit.c +3 -0
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
@@ -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);
#1 lore raw
Quoted 6 lines · Joerg Roedel

Is there a reason why the tunnel driver for IPv6-in-IPv4 is currently compiled into the ipv6 module? This driver is only needed in gateways between different IPv6 networks. On all other hosts with ipv6 enabled it is not required. To have this driver in a seperate module will save memory on those machines.
I appended a small and trival patch to 2.6.18 which does exactly this.

Looks ok to me, although given that users used to get this by default when selecting IPv6, perhaps the default in Kconfig should be y.

- James

Signature · 2 lines
James Morris
<[email protected]>
#2 lore raw
Quoted 11 lines · James Morris
Quoted 6 lines · Joerg Roedel

Is there a reason why the tunnel driver for IPv6-in-IPv4 is currently compiled into the ipv6 module? This driver is only needed in gateways between different IPv6 networks. On all other hosts with ipv6 enabled it is not required. To have this driver in a seperate module will save memory on those machines.
I appended a small and trival patch to 2.6.18 which does exactly this.

Looks ok to me, although given that users used to get this by default when selecting IPv6, perhaps the default in Kconfig should be y.

Ok, a good point to write y there. I change this. I wrote n there because of the "If unsure, say N" sentence in the description.

Joerg

#3 lore raw
In reply to James Morris

In article <[email protected]> (at Thu, 5 Oct 2006 11:49:38 -0400 (EDT)), James Morris <[email protected]> says:

Quoted 11 lines · Joerg Roedel
Quoted 7 lines

Is there a reason why the tunnel driver for IPv6-in-IPv4 is currently compiled into the ipv6 module? This driver is only needed in gateways between different IPv6 networks. On all other hosts with ipv6 enabled it is not required. To have this driver in a seperate module will save memory on those machines.
I appended a small and trival patch to 2.6.18 which does exactly this.

Looks ok to me, although given that users used to get this by default when selecting IPv6, perhaps the default in Kconfig should be y.

Agreed. And, we could add #ifdef in addrconf.c.

--yoshfuji

#4 lore raw
In reply to James Morris
Quoted 2 lines

Looks ok to me, although given that users used to get this by default when selecting IPv6, perhaps the default in Kconfig should be y.

Yes, and the fact that the easiest way to get IPv6 connectivity [1] needs this driver suggests defaulting to yes (and changing the "if unsure..." wording) too.

Olaf

[1] see RFC 3056, RFC 3068; http://sites.inka.de/bigred/sw/6to4