From 0f2b5aa0afc81fd361964abe300dbb2c7011c857 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 20 May 2015 13:59:52 -0700 Subject: android: configs: base: enable IPV6 android-base.cfg already enables several IPV6 sub-options, but not the main IPV6 option. Without this, build errors such has this: net/netfilter/xt_qtaguid.c:1591: undefined reference to `xt_socket_get6_sk' occur if the starting defconfig hasn't already enabled IVP6, Change-Id: I265089a2eec1ef8938e0a6fb95e1aacd16d99281 Cc: John Stultz Signed-off-by: Kevin Hilman --- android/configs/android-base.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg index 81ac35850d5a..ad32ede883b9 100644 --- a/android/configs/android-base.cfg +++ b/android/configs/android-base.cfg @@ -35,6 +35,7 @@ CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y CONFIG_IP6_NF_TARGET_REJECT=y CONFIG_IP6_NF_TARGET_REJECT_SKERR=y +CONFIG_IPV6=y CONFIG_IPV6_MIP6=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_OPTIMISTIC_DAD=y -- cgit v1.2.3 From 66ff7c376168a46ce5556ba42ee1c0abe302cbd0 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 20 May 2015 12:03:50 -0700 Subject: net/Kconfig: paranoid only for android Currently, paranoid networking is enabled by default whether or not and android kernel is being built. However, it should be enabled by default only when and Android kernel is being built. To fix, use "default ANDROID" instead of "default y" Change-Id: Ia19ab766e3497f07ccee846bec1f5fd4017e5977 Cc: John Stultz Signed-off-by: Kevin Hilman --- net/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/Kconfig b/net/Kconfig index 9cc19bc22dda..15a2d76703bb 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -85,7 +85,7 @@ endif # if INET config ANDROID_PARANOID_NETWORK bool "Only allow certain groups to create sockets" - default y + default ANDROID help none -- cgit v1.2.3