From: Steve Muckle Date: Sat, 6 May 2017 01:36:51 +0000 (-0700) Subject: ANDROID: android-base.cfg: remove defunct options X-Git-Tag: release-20171130_firefly~4^2~100^2~115 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7f6a46860e76f9142211e3f95edd2ef96c5a4ee8;p=firefly-linux-kernel-4.4.55.git ANDROID: android-base.cfg: remove defunct options INET6_DIAG_DESTROY and NETFILTER_TPROXY are not used anymore so they should not be part of the base Android kernel configuration. Bug: 37749708 Change-Id: Iab263a5723f1810e2133919b8db93cc2bb986624 Signed-off-by: Steve Muckle --- diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg index 30e01074f64a..748ccf37ca3e 100644 --- a/android/configs/android-base.cfg +++ b/android/configs/android-base.cfg @@ -29,7 +29,6 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_INET6_AH=y -CONFIG_INET6_DIAG_DESTROY=y CONFIG_INET6_ESP=y CONFIG_INET6_IPCOMP=y CONFIG_INET=y @@ -72,7 +71,6 @@ CONFIG_MODVERSIONS=y CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETFILTER=y -CONFIG_NETFILTER_TPROXY=y CONFIG_NETFILTER_XT_MATCH_COMMENT=y CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y CONFIG_NETFILTER_XT_MATCH_CONNMARK=y