diff options
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/netprio_cgroup.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c index ba6900f73900..dbfd4e7f8dc4 100644 --- a/net/core/netprio_cgroup.c +++ b/net/core/netprio_cgroup.c | |||
@@ -23,21 +23,6 @@ | |||
23 | #include <net/sock.h> | 23 | #include <net/sock.h> |
24 | #include <net/netprio_cgroup.h> | 24 | #include <net/netprio_cgroup.h> |
25 | 25 | ||
26 | static struct cgroup_subsys_state *cgrp_create(struct cgroup *cgrp); | ||
27 | static void cgrp_destroy(struct cgroup *cgrp); | ||
28 | static int cgrp_populate(struct cgroup_subsys *ss, struct cgroup *cgrp); | ||
29 | |||
30 | struct cgroup_subsys net_prio_subsys = { | ||
31 | .name = "net_prio", | ||
32 | .create = cgrp_create, | ||
33 | .destroy = cgrp_destroy, | ||
34 | .populate = cgrp_populate, | ||
35 | #ifdef CONFIG_NETPRIO_CGROUP | ||
36 | .subsys_id = net_prio_subsys_id, | ||
37 | #endif | ||
38 | .module = THIS_MODULE | ||
39 | }; | ||
40 | |||
41 | #define PRIOIDX_SZ 128 | 26 | #define PRIOIDX_SZ 128 |
42 | 27 | ||
43 | static unsigned long prioidx_map[PRIOIDX_SZ]; | 28 | static unsigned long prioidx_map[PRIOIDX_SZ]; |
@@ -264,6 +249,17 @@ static int cgrp_populate(struct cgroup_subsys *ss, struct cgroup *cgrp) | |||
264 | return cgroup_add_files(cgrp, ss, ss_files, ARRAY_SIZE(ss_files)); | 249 | return cgroup_add_files(cgrp, ss, ss_files, ARRAY_SIZE(ss_files)); |
265 | } | 250 | } |
266 | 251 | ||
252 | struct cgroup_subsys net_prio_subsys = { | ||
253 | .name = "net_prio", | ||
254 | .create = cgrp_create, | ||
255 | .destroy = cgrp_destroy, | ||
256 | .populate = cgrp_populate, | ||
257 | #ifdef CONFIG_NETPRIO_CGROUP | ||
258 | .subsys_id = net_prio_subsys_id, | ||
259 | #endif | ||
260 | .module = THIS_MODULE | ||
261 | }; | ||
262 | |||
267 | static int netprio_device_event(struct notifier_block *unused, | 263 | static int netprio_device_event(struct notifier_block *unused, |
268 | unsigned long event, void *ptr) | 264 | unsigned long event, void *ptr) |
269 | { | 265 | { |