summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Strudel <tstrudel@google.com>2016-05-11 15:39:14 -0700
committerThierry Strudel <tstrudel@google.com>2016-05-11 19:22:39 -0700
commit394aa6b217a4e28acd6e78086d156b1907e12ae2 (patch)
tree72374666cac11c7560ce477e0dafeeee1e7ddae2
parent692b25b2699d96e0f8149ffd7c686b1f3d4d94af (diff)
downloadmsm-android-msm-bullhead-3.10-n-preview-3.tar.gz
bullhead_defconfig: disable NF_TARGET_REJECT_SKERRandroid-n-preview-3_r0.7android-msm-bullhead-3.10-n-preview-3
Disable forcing socket error when rejecting with icmp* for now due to frequent kernel crash. Bug: 28424847 Change-Id: I3926b2b160fbafe8597d0442b297bd1accf70b4b Signed-off-by: Thierry Strudel <tstrudel@google.com>
-rw-r--r--arch/arm64/configs/bullhead_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/configs/bullhead_defconfig b/arch/arm64/configs/bullhead_defconfig
index 4fcec8156568..1b35aa3e48e6 100644
--- a/arch/arm64/configs/bullhead_defconfig
+++ b/arch/arm64/configs/bullhead_defconfig
@@ -153,7 +153,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
@@ -167,7 +166,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