rk3288:pwm_regulator:slove pwm io set low when power on

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

diff --git a/net/Kconfig b/net/Kconfig
index 878151c772c9ba9fbe8f89636790a52c22b5c889..2a680dadfd6cc7effd3bcc23c34c6ed51764a3b5 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -52,6 +52,8 @@ source "net/iucv/Kconfig"
 
 config INET
        bool "TCP/IP networking"
+       select CRYPTO
+       select CRYPTO_AES
        ---help---
          These are the protocols used on the Internet and on most local
          Ethernets. It is highly recommended to say Y here (this will enlarge
@@ -79,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
@@ -88,7 +104,6 @@ config NETWORK_SECMARK
 
 config NETWORK_PHY_TIMESTAMPING
        bool "Timestamping in PHY devices"
-       depends on EXPERIMENTAL
        help
          This allows timestamping of network packets by PHYs with
          hardware timestamping capabilities. This option adds some
@@ -207,17 +222,19 @@ source "net/ipx/Kconfig"
 source "drivers/net/appletalk/Kconfig"
 source "net/x25/Kconfig"
 source "net/lapb/Kconfig"
-source "net/econet/Kconfig"
-source "net/wanrouter/Kconfig"
 source "net/phonet/Kconfig"
 source "net/ieee802154/Kconfig"
+source "net/mac802154/Kconfig"
 source "net/sched/Kconfig"
 source "net/dcb/Kconfig"
 source "net/dns_resolver/Kconfig"
 source "net/batman-adv/Kconfig"
+source "net/openvswitch/Kconfig"
+source "net/vmw_vsock/Kconfig"
+source "net/netlink/Kconfig"
 
 config RPS
-       boolean
+       boolean "RPS"
        depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
        default y
 
@@ -229,11 +246,21 @@ config RFS_ACCEL
 
 config XPS
        boolean
-       depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
+       depends on SMP && USE_GENERIC_SMP_HELPERS
        default y
 
-config HAVE_BPF_JIT
-       bool
+config NETPRIO_CGROUP
+       tristate "Network priority cgroup"
+       depends on CGROUPS
+       ---help---
+         Cgroup subsystem for use in assigning processes to network priorities on
+         a per-interface basis
+
+config BQL
+       boolean
+       depends on SYSFS
+       select DQL
+       default y
 
 config BPF_JIT
        bool "enable BPF Just In Time compiler"
@@ -265,7 +292,7 @@ config NET_PKTGEN
 
 config NET_TCPPROBE
        tristate "TCP connection probing"
-       depends on INET && EXPERIMENTAL && PROC_FS && KPROBES
+       depends on INET && PROC_FS && KPROBES
        ---help---
        This module allows for capturing the changes to TCP connection
        state in response to incoming packets. It is used for debugging
@@ -281,8 +308,8 @@ config NET_TCPPROBE
        module will be called tcp_probe.
 
 config NET_DROP_MONITOR
-       boolean "Network packet drop alerting service"
-       depends on INET && EXPERIMENTAL && TRACEPOINTS
+       tristate "Network packet drop alerting service"
+       depends on INET && TRACEPOINTS
        ---help---
        This feature provides an alerting service to userspace in the
        event that packets are discarded in the network stack.  Alerts
@@ -322,6 +349,11 @@ source "net/rfkill/Kconfig"
 source "net/9p/Kconfig"
 source "net/caif/Kconfig"
 source "net/ceph/Kconfig"
+source "net/nfc/Kconfig"
 
 
 endif   # if NET
+
+# Used by archs to tell that they support BPF_JIT
+config HAVE_BPF_JIT
+       bool