Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-3.10.git] / net / sched / cls_cgroup.c
index 67cf90d..4a23ccc 100644 (file)
@@ -80,6 +80,15 @@ struct cgroup_subsys net_cls_subsys = {
        .subsys_id      = net_cls_subsys_id,
        .base_cftypes   = ss_files,
        .module         = THIS_MODULE,
+
+       /*
+        * While net_cls cgroup has the rudimentary hierarchy support of
+        * inheriting the parent's classid on cgroup creation, it doesn't
+        * properly propagates config changes in ancestors to their
+        * descendents.  A child should follow the parent's configuration
+        * but be allowed to override it.  Fix it and remove the following.
+        */
+       .broken_hierarchy = true,
 };
 
 struct cls_cgroup_head {