projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9a714c9)
UPSTREAM: config/android: Remove CONFIG_IPV6_PRIVACY
authorBorislav Petkov <bp@suse.de>
Tue, 11 Oct 2016 20:54:36 +0000 (13:54 -0700)
committerAmit Pundir <amit.pundir@linaro.org>
Mon, 10 Apr 2017 07:57:39 +0000 (13:27 +0530)
Option is long gone, see commit 5d9efa7ee99e ("ipv6: Remove privacy
config option.")

Link: http://lkml.kernel.org/r/20160811170340.9859-1-bp@alien8.de
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit a2c6a235dbf4318fc7f7981932478e6c47f093ab)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
android/configs/android-base.cfg patch | blob | history

diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 3672bf339006d07e4a91c2379264ab91101f7971..1ff32af855c34b4bcae990f7d79b30acf987cf0e 100644 (file)
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -41,7 +41,6 @@ CONFIG_IPV6=y
 CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IP_ADVANCED_ROUTER=y
Unnamed repository; edit this file 'description' to name the repository.