projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3c72862)
ANDROID: android-base.cfg: remove defunct options
authorSteve Muckle <smuckle@google.com>
Sat, 6 May 2017 01:36:51 +0000 (18:36 -0700)
committerGreg Kroah-Hartman <gregkh@google.com>
Sat, 6 May 2017 03:38:28 +0000 (03:38 +0000)
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>
android/configs/android-base.cfg patch | blob | blame | history

diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 30e01074f64a7f04c2bb3da85a5b5b6cec6f5540..748ccf37ca3e90e7f12b145a39cfb79eeb4af9a1 100644 (file)
--- 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