* [PATCH 01/02 V2] net/ipv6: seperate sit driver to extra module @ 2006-10-09 9:34 Joerg Roedel 2006-10-09 9:37 ` [PATCH 02/02 V2] net/ipv6: seperate sit driver to extra module (addrconf.c changes) Joerg Roedel 2006-10-10 4:38 ` [PATCH 01/02 V2] net/ipv6: seperate sit driver to extra module David Miller 0 siblings, 2 replies; 4+ messages in thread From: Joerg Roedel @ 2006-10-09 9:34 UTC (permalink / raw) To: linux-kernel, netdev, David Miller [-- Attachment #1: Type: text/plain, Size: 203 bytes --] 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 [-- 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); ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 02/02 V2] net/ipv6: seperate sit driver to extra module (addrconf.c changes) 2006-10-09 9:34 [PATCH 01/02 V2] net/ipv6: seperate sit driver to extra module Joerg Roedel @ 2006-10-09 9:37 ` Joerg Roedel 2006-10-10 4:38 ` [PATCH 01/02 V2] net/ipv6: seperate sit driver to extra module David Miller 1 sibling, 0 replies; 4+ messages in thread From: Joerg Roedel @ 2006-10-09 9:37 UTC (permalink / raw) To: linux-kernel, netdev, David Miller [-- Attachment #1: Type: text/plain, Size: 220 bytes --] 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. [-- 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; ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 01/02 V2] net/ipv6: seperate sit driver to extra module 2006-10-09 9:34 [PATCH 01/02 V2] net/ipv6: seperate sit driver to extra module Joerg Roedel 2006-10-09 9:37 ` [PATCH 02/02 V2] net/ipv6: seperate sit driver to extra module (addrconf.c changes) Joerg Roedel @ 2006-10-10 4:38 ` David Miller 2006-10-10 15:41 ` Joerg Roedel 1 sibling, 1 reply; 4+ messages in thread From: David Miller @ 2006-10-10 4:38 UTC (permalink / raw) To: joro-lkml; +Cc: linux-kernel, netdev From: Joerg Roedel <joro-lkml@zlug.org> Date: Mon, 9 Oct 2006 11:34:16 +0200 > 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 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. ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 01/02 V2] net/ipv6: seperate sit driver to extra module 2006-10-10 4:38 ` [PATCH 01/02 V2] net/ipv6: seperate sit driver to extra module David Miller @ 2006-10-10 15:41 ` Joerg Roedel 0 siblings, 0 replies; 4+ messages in thread From: Joerg Roedel @ 2006-10-10 15:41 UTC (permalink / raw) To: David Miller; +Cc: linux-kernel, netdev On Mon, Oct 09, 2006 at 09:38:56PM -0700, David Miller wrote: > 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. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-10-10 15:41 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2006-10-09 9:34 [PATCH 01/02 V2] net/ipv6: seperate sit driver to extra module Joerg Roedel 2006-10-09 9:37 ` [PATCH 02/02 V2] net/ipv6: seperate sit driver to extra module (addrconf.c changes) Joerg Roedel 2006-10-10 4:38 ` [PATCH 01/02 V2] net/ipv6: seperate sit driver to extra module David Miller 2006-10-10 15:41 ` Joerg Roedel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).