2 files changed, 4 insertions, 8 deletions

diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h
index f55c14510bd6..33d03b648646 100644
--- 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;
diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
index 379dd5db0f2f..099d02782e22 100644
--- a/include/net/netprio_cgroup.h
+++ b/include/net/netprio_cgroup.h
@@ -25,10 +25,6 @@ struct netprio_map {
         u32 priomap[];
 };
 
-struct cgroup_netprio_state {
-        struct cgroup_subsys_state css;
-};
-
 void sock_update_netprioidx(struct sock *sk);
 
 #if IS_BUILTIN(CONFIG_NETPRIO_CGROUP)
@@ -39,7 +35,7 @@ static inline u32 task_netprioidx(struct task_struct *p)
         u32 idx;
 
         rcu_read_lock();
-        css = task_subsys_state(p, net_prio_subsys_id);
+        css = task_css(p, net_prio_subsys_id);
         idx = css->cgroup->id;
         rcu_read_unlock();
         return idx;
@@ -53,7 +49,7 @@ static inline u32 task_netprioidx(struct task_struct *p)
         u32 idx = 0;
 
         rcu_read_lock();
-        css = task_subsys_state(p, net_prio_subsys_id);
+        css = task_css(p, net_prio_subsys_id);
         if (css)
                 idx = css->cgroup->id;
         rcu_read_unlock();