[PATCH 1/1] UBUNTU: [Config] enable CONFIG_IPV6_SIT_6RD

[Andy Whitcroft]

Enable IPv6 Rapid Deployment tunnelling support.  Whilst this support
is still marked EXPERIMENTAL this support is going to be a corner stone
of IPv6 deployments in existing IPv4 ISPs.  Pressure is being placed on
ISPs to convert over to IPv6 due to IPv4 address scarcity.  Looking at the
code this enabled an extension to the current 6to4 tunnelling mechanism.
Both 6to4 tunnelling and 6rd are opt-in mechanisms.

BugLink: http://bugs.launchpad.net/bugs/591869
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian.master/config/config.common.ports  |    2 +-
 debian.master/config/config.common.ubuntu |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index 07726e6..be5e07d 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -1551,7 +1551,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
 CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPW2100=m
 # CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2100_MONITOR=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 59dd011..a5c369b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2027,7 +2027,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_PRIVACY=y
 # CONFIG_IPV6_ROUTER_PREF is not set
 CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_SIT_6RD=y
 # CONFIG_IPV6_SUBTREES is not set
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPW2100=m
-- 
1.7.0.4