[PATCH 1/1] [Lucid] SRU: UBUNTU: [Config] Enable multicast routing for sparc

[Stefan Bader]

Making the config also more common over all architectures which is a good thing.

Leann Ogasawara wrote:
> Hi All,
> 
> https://bugs.edge.launchpad.net/ubuntu/+source/linux/+bug/416266
> 
> Lucid SRU Justification:
> 
> Impact: Multicast routing was enabled for sparc in Hardy as an SRU.
> Unfortunately the change doesn't appear to have been pulled forward into
> Lucid (an oversight on my part). Please consider the following patch
> which enables CONFIG_IP_MROUTE=y for sparc in Lucid.
> 
> Testcase: Install and run a sparc Lucid kernel and confirm that
> multicast routing is not supported (including PIM1 and PIM2). Install
> the corresponding patched Lucid kernel, reboot, and confirm multicast
> routing is now supported.
> 
> Thanks,
> Leann
> 
> The following changes since commit 44dbdb13eab1b5813a6dbe25cd3e2b52bae46e10:
>   Andy Whitcroft (1):
>         UBUNTU: [Config] enforce -- ensure dm_mod is built-in for LVM
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/ogasawara/ubuntu-lucid lp416266
> 
> Leann Ogasawara (1):
>       UBUNTU: [Config] Enable multicast routing for sparc
> 
>  debian.master/config/config.common.ports           |    1 +
>  debian.master/config/ia64/config.common.ia64       |    1 -
>  debian.master/config/powerpc/config.common.powerpc |    1 -
>  debian.master/config/sparc/config.common.sparc     |    1 -
>  4 files changed, 1 insertions(+), 3 deletions(-)
> 
>>From a68fb32dcb069c275f77a6c6f8c3d760ba80902c Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara <leann.ogasawara at canonical.com>
> Date: Fri, 23 Apr 2010 11:35:14 -0700
> Subject: [PATCH] UBUNTU: [Config] Enable multicast routing for sparc
> 
> BugLink: http://bugs.launchpad.net/bugs/416266
> 
> Multicast routing was enabled for sparc in Hardy as an SRU.
> Unfortunately, the change doesn't appear to have been pulled forward
> into Lucid.  Enable CONFIG_IP_MROUTE=y for sparc.
> 
> Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
Acked-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>  debian.master/config/config.common.ports           |    1 +
>  debian.master/config/ia64/config.common.ia64       |    1 -
>  debian.master/config/powerpc/config.common.powerpc |    1 -
>  debian.master/config/sparc/config.common.sparc     |    1 -
>  4 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
> index 6e1517c..6548ed9 100644
> --- a/debian.master/config/config.common.ports
> +++ b/debian.master/config/config.common.ports
> @@ -1437,6 +1437,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
>  CONFIG_IP_DCCP_TFRC_LIB=y
>  CONFIG_IP_FIB_HASH=y
>  # CONFIG_IP_FIB_TRIE is not set
> +CONFIG_IP_MROUTE=y
>  CONFIG_IP_MULTICAST=y
>  CONFIG_IP_MULTIPLE_TABLES=y
>  CONFIG_IP_NF_ARPFILTER=m
> diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64
> index ea554e3..711fe90 100644
> --- a/debian.master/config/ia64/config.common.ia64
> +++ b/debian.master/config/ia64/config.common.ia64
> @@ -117,7 +117,6 @@ CONFIG_INPUT_UINPUT=m
>  # CONFIG_IPV6_PRIVACY is not set
>  # CONFIG_IPV6_TUNNEL is not set
>  # CONFIG_IP_DCCP is not set
> -CONFIG_IP_MROUTE=y
>  # CONFIG_IP_NF_QUEUE is not set
>  # CONFIG_IP_PNP is not set
>  CONFIG_IP_ROUTE_MULTIPATH=y
> diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
> index a7cfcc0..1ad3193 100644
> --- a/debian.master/config/powerpc/config.common.powerpc
> +++ b/debian.master/config/powerpc/config.common.powerpc
> @@ -107,7 +107,6 @@ CONFIG_IPMI_POWEROFF=m
>  CONFIG_IPV6_PRIVACY=y
>  CONFIG_IPV6_TUNNEL=m
>  CONFIG_IP_DCCP=m
> -CONFIG_IP_MROUTE=y
>  CONFIG_IP_NF_QUEUE=m
>  # CONFIG_IP_PNP is not set
>  CONFIG_IP_ROUTE_MULTIPATH=y
> diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc
> index 95c5472..89ffb7c 100644
> --- a/debian.master/config/sparc/config.common.sparc
> +++ b/debian.master/config/sparc/config.common.sparc
> @@ -120,7 +120,6 @@ CONFIG_IPMI_HANDLER=m
>  CONFIG_IPV6_PRIVACY=y
>  CONFIG_IPV6_TUNNEL=m
>  CONFIG_IP_DCCP=m
> -# CONFIG_IP_MROUTE is not set
>  CONFIG_IP_NF_QUEUE=m
>  CONFIG_IP_PNP=y
>  # CONFIG_IP_ROUTE_MULTIPATH is not set