diff --git a/[refs] b/[refs] index 043944396166..c0a4287e7537 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f16d3d57486cd079b29ae7a6c3b31c90e69c9c44 +refs/heads/master: 937eada45fa7bd233dfa59bbd8c0b436b02b6491 diff --git a/trunk/include/net/cls_cgroup.h b/trunk/include/net/cls_cgroup.h index ef2df1475b51..6cf44866cecd 100644 --- a/trunk/include/net/cls_cgroup.h +++ b/trunk/include/net/cls_cgroup.h @@ -31,7 +31,7 @@ static inline u32 task_cls_classid(struct task_struct *p) return 0; return container_of(task_subsys_state(p, net_cls_subsys_id), - struct cgroup_cls_state, css).classid; + struct cgroup_cls_state, css)->classid; } #else extern int net_cls_subsys_id;