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 <smuckle@google.com>
This commit is contained in:
Steve Muckle 2017-05-05 18:36:51 -07:00 committed by Greg Kroah-Hartman
parent 3c72862e8f
commit 40d8db5ddf

View file

@ -29,7 +29,6 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y CONFIG_IKCONFIG_PROC=y
CONFIG_INET6_AH=y CONFIG_INET6_AH=y
CONFIG_INET6_DIAG_DESTROY=y
CONFIG_INET6_ESP=y CONFIG_INET6_ESP=y
CONFIG_INET6_IPCOMP=y CONFIG_INET6_IPCOMP=y
CONFIG_INET=y CONFIG_INET=y
@ -72,7 +71,6 @@ CONFIG_MODVERSIONS=y
CONFIG_NET=y CONFIG_NET=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_TPROXY=y
CONFIG_NETFILTER_XT_MATCH_COMMENT=y CONFIG_NETFILTER_XT_MATCH_COMMENT=y
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
CONFIG_NETFILTER_XT_MATCH_CONNMARK=y CONFIG_NETFILTER_XT_MATCH_CONNMARK=y