Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into...

[firefly-linux-kernel-4.4.55.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 2ddc9046868e7a19d06841054696773242099ccf..2a680dadfd6cc7effd3bcc23c34c6ed51764a3b5 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -81,6 +81,20 @@ source "net/netlabel/Kconfig"
 
 endif # if INET
 
+config ANDROID_PARANOID_NETWORK
+       bool "Only allow certain groups to create sockets"
+       default ANDROID
+       help
+               none
+
+config NET_ACTIVITY_STATS
+       bool "Network activity statistics tracking"
+       default ANDROID
+       help
+        Network activity statistics are useful for tracking wireless
+        modem activity on 2G, 3G, 4G wireless networks. Counts number of
+        transmissions and groups them in specified time buckets.
+
 config NETWORK_SECMARK
        bool "Security Marking"
        help
@@ -220,7 +234,7 @@ source "net/vmw_vsock/Kconfig"
 source "net/netlink/Kconfig"
 
 config RPS
-       boolean
+       boolean "RPS"
        depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
        default y