goldfish: Enable multinetwork kernel feature.

These are required for Android L and beyond. The following changes
were generated by doing the following:

 1) For each CPU architecture, append the following to its _defconfig
    file:

	CONFIG_IPV6=y
	CONFIG_IPV6_MULTIPLE_TABLES=y
	CONFIG_IP_ADVANCED_ROUTER=y
	CONFIG_IP_MULTIPLE_TABLES=y
	CONFIG_NETFILTER=y
	CONFIG_NETFILTER_ADVANCED=y
	CONFIG_NETFILTER_XTABLES=y
	CONFIG_NETFILTER_XT_MARK=y
	CONFIG_NETFILTER_XT_TARGET_MARK=y
	CONFIG_IP_NF_IPTABLES=y
	CONFIG_IP_NF_MANGLE=y
	CONFIG_IP6_NF_IPTABLES=y
	CONFIG_IP6_NF_MANGLE=y

  2) For each CPU architecture, run:

      $AOSP/external/qemu/distrib/rebuild-kernel.sh --arch=$ARCH --savedefconfig

  The --savedefconfig option ensures the _defconfig is modified to only
  contain the minimal amount of changes required, and removes un-necessary
  definitions too.

BUG=17516983

Signed-off-by: David 'Digit' Turner <digit@android.com>

diff --git a/arch/arm64/configs/ranchu_defconfig b/arch/arm64/configs/ranchu_defconfig
index 0aab1c6a9df7f834e174d5c3eab8ec80bf2a37bc..8988f43628125badccd3e8af6861b46d93bfb11a 100644 (file)
--- a/arch/arm64/configs/ranchu_defconfig
+++ b/arch/arm64/configs/ranchu_defconfig
@@ -34,12 +34,16 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_NETFILTER=y
+CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_AH=y
 CONFIG_IP_NF_MATCH_ECN=y

diff --git a/arch/x86/configs/i386_emu_defconfig b/arch/x86/configs/i386_emu_defconfig
index 084af64360bcbc51f268ce250b7651bc6cd991af..1df0644e59491d5fad069ee2e515c84fda32dc85 100644 (file)
--- a/arch/x86/configs/i386_emu_defconfig
+++ b/arch/x86/configs/i386_emu_defconfig
@@ -79,15 +79,16 @@ CONFIG_INET_ESP=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
 CONFIG_IPV6=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_NETLABEL=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_ADVANCED is not set
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_FTP=y
 CONFIG_NF_CONNTRACK_IRC=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=y
 CONFIG_NF_CT_NETLINK=y
+CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y

diff --git a/arch/x86/configs/x86_64_emu_defconfig b/arch/x86/configs/x86_64_emu_defconfig
index f79001508e218daa40afc24e93806129ca9c58af..8ef7e1fc3065ac2be09a84ea092985bf30b93961 100644 (file)
--- a/arch/x86/configs/x86_64_emu_defconfig
+++ b/arch/x86/configs/x86_64_emu_defconfig
@@ -81,15 +81,16 @@ CONFIG_INET_ESP=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
 CONFIG_IPV6=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_NETLABEL=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_ADVANCED is not set
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_FTP=y
 CONFIG_NF_CONNTRACK_IRC=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=y
 CONFIG_NF_CT_NETLINK=y
+CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y