summaryrefslogtreecommitdiff
path: root/src/core/manager.h
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2016-02-10 15:44:01 +0100
committerDaniel Mack <daniel@zonque.org>2016-02-10 16:38:56 +0100
commit50f48ad37aad99c54de4db34b07c3825cdedcf41 (patch)
treec0a07c9391acf5d1aa9968cd9e25eda9eab58785 /src/core/manager.h
parent16a798deb3b560f8b27848fe292a76b362c0b581 (diff)
cgroup: remove support for NetClass= directive
Support for net_cls.class_id through the NetClass= configuration directive has been added in v227 in preparation for a per-unit packet filter mechanism. However, it turns out the kernel people have decided to deprecate the net_cls and net_prio controllers in v2. Tejun provides a comprehensive justification for this in his commit, which has landed during the merge window for kernel v4.5: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=bd1060a1d671 As we're aiming for full support for the v2 cgroup hierarchy, we can no longer support this feature. Userspace tool such as nftables are moving over to setting rules that are specific to the full cgroup path of a task, which obsoletes these controllers anyway. This commit removes support for tweaking details in the net_cls controller, but keeps the NetClass= directive around for legacy compatibility reasons.
Diffstat (limited to 'src/core/manager.h')
-rw-r--r--src/core/manager.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core/manager.h b/src/core/manager.h
index 5b226bc084..9803f73129 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -305,10 +305,6 @@ struct Manager {
const char *unit_log_format_string;
int first_boot;
-
- /* Used for NetClass=auto units */
- Hashmap *cgroup_netclass_registry;
- uint32_t cgroup_netclass_registry_last;
};
int manager_new(ManagerRunningAs running_as, bool test_run, Manager **m);