net/ipv6: seperate sit driver to extra module
Subsystems (3)
PATCH v2 1/2 net/ipv6: seperate sit driver to extra module
This is the changed version of the patch making the sit driver configurable as a seperate module.
Changes:
- spelling fixes in Kconfig
- changed "If unsure, say N" to "If unsure, say Y" for consistency
net/ipv6/af_inet6.c +0 -2
@@ -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
@@ -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
net/ipv6/Makefile +2 -1
@@ -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
@@ -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 v2 2/2 net/ipv6: seperate sit driver to extra module (addrconf.c changes)
Decond part of the patch. It contains changes to to net/ipv6/addrconf.c to remove sit specific code if the sit driver it not selected. There are no changes to previous sumbit. This patch is resubmitted for completeness.
net/ipv6/addrconf.c +16 -2
@@ -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 *pThis 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 nip6_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 *arif (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 *argreturn 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 naddrconf_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 } elsesit_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 ;
David Miller
maintainerFrom: Joerg Roedel <[email protected]>
Date: Mon, 9 Oct 2006 11:34:16 +0200
Quoted 6 lines
This is the changed version of the patch making the sit driver configurable as a seperate module.
Changes:
- spelling fixes inKconfig
- changed "If unsure, say N" to "If unsure, say Y" for consistency
Joerg, when you make resubmissions, please always restate the full changelog and all signed-off-by lines.
If you want to say "Changed since last version" do that seperately at the top of the email, right before the main changelog entry and the patch itself.
I wanted to apply this latest version of these two patches, but I cannot because the full changelog isn't here. Please get this into a mergable form for me.
Thanks a lot.
Quoted 10 lines · David Miller
Joerg, when you make resubmissions, please always restate the full changelog and all signed-off-by lines.
If you want to say "Changed since last version" do that seperately at the top of the email, right before the main changelog entry and the patch itself.
I wanted to apply this latest version of these two patches, but I cannot because the full changelog isn't here. Please get this into a mergable form for me.
Ok, thanks for your hints. I resubmitted the changes with the appropriate changelog entries. I should be ok now.