diff options
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/cls_cgroup.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index 7743ea8d1d38..67cf90d962f4 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c | |||
@@ -77,9 +77,7 @@ struct cgroup_subsys net_cls_subsys = { | |||
77 | .name = "net_cls", | 77 | .name = "net_cls", |
78 | .create = cgrp_create, | 78 | .create = cgrp_create, |
79 | .destroy = cgrp_destroy, | 79 | .destroy = cgrp_destroy, |
80 | #ifdef CONFIG_NET_CLS_CGROUP | ||
81 | .subsys_id = net_cls_subsys_id, | 80 | .subsys_id = net_cls_subsys_id, |
82 | #endif | ||
83 | .base_cftypes = ss_files, | 81 | .base_cftypes = ss_files, |
84 | .module = THIS_MODULE, | 82 | .module = THIS_MODULE, |
85 | }; | 83 | }; |
@@ -283,12 +281,6 @@ static int __init init_cgroup_cls(void) | |||
283 | if (ret) | 281 | if (ret) |
284 | goto out; | 282 | goto out; |
285 | 283 | ||
286 | #ifndef CONFIG_NET_CLS_CGROUP | ||
287 | /* We can't use rcu_assign_pointer because this is an int. */ | ||
288 | smp_wmb(); | ||
289 | net_cls_subsys_id = net_cls_subsys.subsys_id; | ||
290 | #endif | ||
291 | |||
292 | ret = register_tcf_proto_ops(&cls_cgroup_ops); | 284 | ret = register_tcf_proto_ops(&cls_cgroup_ops); |
293 | if (ret) | 285 | if (ret) |
294 | cgroup_unload_subsys(&net_cls_subsys); | 286 | cgroup_unload_subsys(&net_cls_subsys); |
@@ -301,11 +293,6 @@ static void __exit exit_cgroup_cls(void) | |||
301 | { | 293 | { |
302 | unregister_tcf_proto_ops(&cls_cgroup_ops); | 294 | unregister_tcf_proto_ops(&cls_cgroup_ops); |
303 | 295 | ||
304 | #ifndef CONFIG_NET_CLS_CGROUP | ||
305 | net_cls_subsys_id = -1; | ||
306 | synchronize_rcu(); | ||
307 | #endif | ||
308 | |||
309 | cgroup_unload_subsys(&net_cls_subsys); | 296 | cgroup_unload_subsys(&net_cls_subsys); |
310 | } | 297 | } |
311 | 298 | ||