From: Borislav Petkov <bp@suse.de>
Date: Tue, 11 Oct 2016 20:54:36 +0000 (-0700)
Subject: UPSTREAM: config/android: Remove CONFIG_IPV6_PRIVACY
X-Git-Tag: release-20171130_firefly~4^2~100^2~165
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f91f25c224eead4166bbe96835ab04f13458585d;p=firefly-linux-kernel-4.4.55.git

UPSTREAM: config/android: Remove CONFIG_IPV6_PRIVACY

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>
---

diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 3672bf339006..1ff32af855c3 100644
--- 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