Patched in Tegra support.

1 files changed, 19 insertions, 22 deletions

diff --git a/net/Kconfig b/net/Kconfig
index 30b48f52313..a54855c6632 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -52,8 +52,6 @@ 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
@@ -81,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
@@ -209,18 +221,17 @@ 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"
 
 config RPS
-        boolean
+        boolean "RPS"
         depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
         default y
 
@@ -235,18 +246,8 @@ config XPS
         depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
         default y
 
-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 HAVE_BPF_JIT
+        bool
 
 config BPF_JIT
         bool "enable BPF Just In Time compiler"
@@ -294,7 +295,7 @@ config NET_TCPPROBE
         module will be called tcp_probe.
 
 config NET_DROP_MONITOR
-        tristate "Network packet drop alerting service"
+        boolean "Network packet drop alerting service"
         depends on INET && EXPERIMENTAL && TRACEPOINTS
         ---help---
         This feature provides an alerting service to userspace in the
@@ -339,7 +340,3 @@ source "net/nfc/Kconfig"
 
 
 endif   # if NET
-
-# Used by archs to tell that they support BPF_JIT
-config HAVE_BPF_JIT
-        bool