Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / include / net / cls_cgroup.h

diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h
index f55c145..33d03b6 100644 (file)
--- a/include/net/cls_cgroup.h
+++ b/include/net/cls_cgroup.h
@@ -35,7 +35,7 @@ static inline u32 task_cls_classid(struct task_struct *p)
                return 0;
 
        rcu_read_lock();
-       classid = container_of(task_subsys_state(p, net_cls_subsys_id),
+       classid = container_of(task_css(p, net_cls_subsys_id),
                               struct cgroup_cls_state, css)->classid;
        rcu_read_unlock();
 
@@ -51,7 +51,7 @@ static inline u32 task_cls_classid(struct task_struct *p)
                return 0;
 
        rcu_read_lock();
-       css = task_subsys_state(p, net_cls_subsys_id);
+       css = task_css(p, net_cls_subsys_id);
        if (css)
                classid = container_of(css,
                                       struct cgroup_cls_state, css)->classid;