USB: gadget: android: Fix problem switching vendor IDs

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

diff --git a/net/Kconfig b/net/Kconfig
index 878151c772c9ba9fbe8f89636790a52c22b5c889..919cf9a8212244baf2a401ef3c8b6041647bb91c 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -79,6 +79,20 @@ source "net/netlabel/Kconfig"
 
 endif # if INET
 
+config ANDROID_PARANOID_NETWORK
+       bool "Only allow certain groups to create sockets"
+       default y
+       help
+               none
+
+config NET_ACTIVITY_STATS
+       bool "Network activity statistics tracking"
+       default y
+       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
@@ -217,7 +231,7 @@ source "net/dns_resolver/Kconfig"
 source "net/batman-adv/Kconfig"
 
 config RPS
-       boolean
+       boolean "RPS"
        depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
        default y