From patchwork Mon Jun 21 17:41:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 56336 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 6AE0DB6F14 for ; Tue, 22 Jun 2010 03:42:03 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OQl0P-0004Ad-Iz; Mon, 21 Jun 2010 18:41:57 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OQl0O-0004AP-1U for kernel-team@lists.ubuntu.com; Mon, 21 Jun 2010 18:41:56 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OQl0O-0003n4-09 for ; Mon, 21 Jun 2010 18:41:56 +0100 Received: from [85.210.146.14] (helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OQl0N-000372-Rz for kernel-team@lists.ubuntu.com; Mon, 21 Jun 2010 18:41:55 +0100 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] UBUNTU: [Config] enable CONFIG_IPV6_SIT_6RD Date: Mon, 21 Jun 2010 18:41:55 +0100 Message-Id: <1277142115-29733-1-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.0.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 Acked-by: Tim Gardner --- 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