[F] [PATCH] UBUNTU: [Config] CONFIG_IP_MROUTE_MULTIPLE_TABLES=y

[Andrea Righi]

BugLink: https://bugs.launchpad.net/bugs/1865332

To properly support SMCRoute with multiple routing tables we need to
enable CONFIG_IP_MROUTE_MULTIPLE_TABLES.

The corresponding IPv6 option (CONFIG_IPV6_MULTIPLE_TABLES) is already
enabled, so it seems reasonable to enable also the IPv4 one for
consistency.

Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
---
 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index bec875bb7182..e8b49be86b7f 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11858,7 +11858,7 @@ CONFIG_IP_PNP                                   note<LP:1259861>
 
 # Menu: Networking support >> Networking options >> TCP/IP networking >> IP: multicast routing
 CONFIG_IP_MROUTE                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_IP_MROUTE_MULTIPLE_TABLES                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_IP_MROUTE_MULTIPLE_TABLES                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_IP_PIMSM_V1                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_IP_PIMSM_V2                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8b928b46401f..13b8c3f52f15 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4700,7 +4700,7 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 CONFIG_IP_FIB_TRIE_STATS=y
 CONFIG_IP_MROUTE=y
 CONFIG_IP_MROUTE_COMMON=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
-- 
2.25.0