summaryrefslogtreecommitdiffstats
path: root/net/Kconfig
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-12-29 18:27:10 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2014-01-03 23:41:41 +0100
commitfe1217c4f3f7d7cbf8efdd8dd5fdc7204a1d65a8 (patch)
treeac34c3a9183c96cbe695a29614de6f65a7934849 /net/Kconfig
parent14abfa161d256c60f3ea6ba494704ac634b94f63 (diff)
downloadop-kernel-dev-fe1217c4f3f7d7cbf8efdd8dd5fdc7204a1d65a8.zip
op-kernel-dev-fe1217c4f3f7d7cbf8efdd8dd5fdc7204a1d65a8.tar.gz
net: net_cls: move cgroupfs classid handling into core
Zefan Li requested [1] to perform the following cleanup/refactoring: - Split cgroupfs classid handling into net core to better express a possible more generic use. - Disable module support for cgroupfs bits as the majority of other cgroupfs subsystems do not have that, and seems to be not wished from cgroup side. Zefan probably might want to follow-up for netprio later on. - By this, code can be further reduced which previously took care of functionality built when compiled as module. cgroupfs bits are being placed under net/core/netclassid_cgroup.c, so that we are consistent with {netclassid,netprio}_cgroup naming that is under net/core/ as suggested by Zefan. No change in functionality, but only code refactoring that is being done here. [1] http://patchwork.ozlabs.org/patch/304825/ Suggested-by: Li Zefan <lizefan@huawei.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Cc: Zefan Li <lizefan@huawei.com> Cc: Thomas Graf <tgraf@suug.ch> Cc: cgroups@vger.kernel.org Acked-by: Li Zefan <lizefan@huawei.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/Kconfig')
-rw-r--r--net/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/Kconfig b/net/Kconfig
index d334678..7da10b8 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -245,6 +245,13 @@ config NETPRIO_CGROUP
Cgroup subsystem for use in assigning processes to network priorities on
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
default y
OpenPOWER on IntegriCloud