← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to net/sched/cls_cgroup.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/sched/cls_cgroup.c
56
56
{
57
57
        struct cgroup_cls_state *cs;
58
58
 
59
 
        if (!(cs = kzalloc(sizeof(*cs), GFP_KERNEL)))
 
59
        cs = kzalloc(sizeof(*cs), GFP_KERNEL);
 
60
        if (!cs)
60
61
                return ERR_PTR(-ENOMEM);
61
62
 
62
63
        if (cgrp->parent)
94
95
        return cgroup_add_files(cgrp, ss, ss_files, ARRAY_SIZE(ss_files));
95
96
}
96
97
 
97
 
struct cls_cgroup_head
98
 
{
 
98
struct cls_cgroup_head {
99
99
        u32                     handle;
100
100
        struct tcf_exts         exts;
101
101
        struct tcf_ematch_tree  ematches;
166
166
                             u32 handle, struct nlattr **tca,
167
167
                             unsigned long *arg)
168
168
{
169
 
        struct nlattr *tb[TCA_CGROUP_MAX+1];
 
169
        struct nlattr *tb[TCA_CGROUP_MAX + 1];
170
170
        struct cls_cgroup_head *head = tp->root;
171
171
        struct tcf_ematch_tree t;
172
172
        struct tcf_exts e;