Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13a29d9a authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'v3.18/topic/android/aosp-fixes' into linux-linaro-lsk-v3.18-android 

* v3.18/topic/android/aosp-fixes:
  net/Kconfig: paranoid only for android
  android: configs: base: enable IPV6
parents ad689af6 66ff7c37

android/configs/android-base.cfg

+1 −0
Original line number Diff line number Diff line
@@ -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

net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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