tcp: do not export tcp_gso_segment() and tcp_gro_receive()

[deliverable/linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 0715db64a5c3dd7ea0cd12f09c3fe62ee8385f3a..e411046a62e3f0fe82281bc6b97dd8a1183558d1 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -224,7 +224,7 @@ source "net/hsr/Kconfig"
 
 config RPS
        boolean
-       depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
+       depends on SMP && SYSFS
        default y
 
 config RFS_ACCEL
@@ -235,15 +235,22 @@ config RFS_ACCEL
 
 config XPS
        boolean
-       depends on SMP && USE_GENERIC_SMP_HELPERS
+       depends on SMP
        default y
 
-config NETPRIO_CGROUP
+config CGROUP_NET_PRIO
        tristate "Network priority cgroup"
        depends on CGROUPS
        ---help---
          Cgroup subsystem for use in assigning processes to network priorities on
-         a per-interface basis
+         a per-interface basis.
+
+config CGROUP_NET_CLASSID
+       boolean "Network classid cgroup"
+       depends on CGROUPS
+       ---help---
+         Cgroup subsystem for use as general purpose socket classid marker that is
+         being used in cls_cgroup and for netfilter matching.
 
 config NET_RX_BUSY_POLL
        boolean