aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-06-16 15:19:05 -0700
committerKevin Hilman <khilman@linaro.org>2015-06-16 15:19:05 -0700
commit13a29d9ad242f0bf3b31afe812c81558d54892de (patch)
tree455bd114c6fd0c9188d6b85c690877d40231d946
parentad689af687fa7ee83fe560744f700393fd879015 (diff)
parent66ff7c376168a46ce5556ba42ee1c0abe302cbd0 (diff)
downloadlinux-linaro-stable-13a29d9ad242f0bf3b31afe812c81558d54892de.tar.gz
Merge branch 'v3.18/topic/android/aosp-fixes' into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.06-android
* v3.18/topic/android/aosp-fixes: net/Kconfig: paranoid only for android android: configs: base: enable IPV6
-rw-r--r--android/configs/android-base.cfg1
-rw-r--r--net/Kconfig2
2 files changed, 2 insertions, 1 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 81ac35850d5a..ad32ede883b9 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -35,6 +35,7 @@ CONFIG_IP6_NF_MANGLE=y
CONFIG_IP6_NF_RAW=y
CONFIG_IP6_NF_TARGET_REJECT=y
CONFIG_IP6_NF_TARGET_REJECT_SKERR=y
+CONFIG_IPV6=y
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_OPTIMISTIC_DAD=y
diff --git a/net/Kconfig b/net/Kconfig
index 9cc19bc22dda..15a2d76703bb 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -85,7 +85,7 @@ endif # if INET
config ANDROID_PARANOID_NETWORK
bool "Only allow certain groups to create sockets"
- default y
+ default ANDROID
help
none