--- zzzz-none-000/linux-2.6.28.10/net/ipv6/Kconfig	2009-05-02 18:54:43.000000000 +0000
+++ fusiv-7390-686/linux-2.6.28.10/net/ipv6/Kconfig	2012-02-14 14:37:49.000000000 +0000
@@ -21,6 +21,20 @@
 
 if IPV6
 
+config IPV6_CPE_RFC_6204
+	bool "IPv6: Basic Requirements for IPv6 Customer Edge Routers"
+	default n
+	---help---
+	  Implementation of to be RFC 6204 on top of Linux stack to enable both
+	  Router Advertisement on Local Network and Learning IPV6 address on 
+	  WAN interface.  Further information can be found in following link:
+
+	
+	  By default this feature is disabled, to enable choose Y here: If not sure
+	  choose N.
+
+	  see <http://www.rfc-editor.org/in-notes/authors/rfc6204.txt> for more details. 
+
 config IPV6_PRIVACY
 	bool "IPv6: Privacy Extensions support"
 	---help---
@@ -168,7 +182,26 @@
 	  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.
+	  Saying M here will produce a module called sit. If unsure, say Y.
+
+config IPV6_SIT_6RD
+	bool "IPv6: IPv6 Rapid Deployment (6RD) (EXPERIMENTAL)"
+	depends on IPV6_SIT && EXPERIMENTAL
+	default n
+	---help---
+	  IPv6 Rapid Deployment (6rd; draft-ietf-softwire-ipv6-6rd) builds upon
+	  mechanisms of 6to4 (RFC3056) to enable a service provider to rapidly
+	  deploy IPv6 unicast service to IPv4 sites to which it provides
+	  customer premise equipment.  Like 6to4, it utilizes stateless IPv6 in
+	  IPv4 encapsulation in order to transit IPv4-only network
+	  infrastructure.  Unlike 6to4, a 6rd service provider uses an IPv6
+	  prefix of its own in place of the fixed 6to4 prefix.
+
+	  With this option enabled, the SIT driver offers 6rd functionality by
+	  providing additional ioctl API to configure the IPv6 Prefix for in
+	  stead of static 2002::/16 for 6to4.
+
+	  If unsure, say N.
 
 config IPV6_NDISC_NODETYPE
 	bool
@@ -203,6 +236,14 @@
 
 	  If unsure, say N.
 
+
+
+
+if LANTIQ
+#IFX plaform specific
+source "net/ipv6/Kconfig.ifx"
+endif
+
 config IPV6_MROUTE
 	bool "IPv6: multicast routing (EXPERIMENTAL)"
 	depends on IPV6 && EXPERIMENTAL