aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Strudel <tstrudel@google.com>2016-05-11 16:27:06 -0700
committerThierry Strudel <tstrudel@google.com>2016-05-11 16:27:06 -0700
commit1aa2c7e326dc2acc6986a47b263a7b46d50379c8 (patch)
tree46d2039c430daa2b80e5a5d7a86bae8444172c68
parent3f8123ba61242ccba574f188a5afa971d2f8fb09 (diff)
shamu_defconfig: disable NF_TARGET_REJECT_SKERRandroid-n-preview-3_r0.5
Disable forcing socket error when rejecting with icmp* for now due to frequent kernel crash. Bug: 28424847 Change-Id: Id9d45017bf56752d5e027baefbcc7f7e3a52dd08 Signed-off-by: Thierry Strudel <tstrudel@google.com>
-rw-r--r--arch/arm/configs/shamu_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/shamu_defconfig b/arch/arm/configs/shamu_defconfig
index 53f728dd2139..059982182e33 100644
--- a/arch/arm/configs/shamu_defconfig
+++ b/arch/arm/configs/shamu_defconfig
@@ -188,7 +188,6 @@ CONFIG_IP_NF_MATCH_ECN=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_TARGET_REJECT_SKERR=y
CONFIG_NF_NAT_IPV4=y
CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_NETMAP=y
@@ -203,7 +202,6 @@ CONFIG_NF_CONNTRACK_IPV6=y
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_FILTER=y
CONFIG_IP6_NF_TARGET_REJECT=y
-CONFIG_IP6_NF_TARGET_REJECT_SKERR=y
CONFIG_IP6_NF_MANGLE=y
CONFIG_IP6_NF_RAW=y
CONFIG_BRIDGE_NF_EBTABLES=y