@@ -29,26 +29,15 @@ extern void sock_update_classid(struct sock *sk);
#if IS_BUILTIN(CONFIG_NET_CLS_CGROUP)
-static inline u32 task_cls_classid(struct task_struct *p)
-{
- int classid;
-
- if (in_interrupt())
- return 0;
-
- rcu_read_lock();
- classid = container_of(task_subsys_state(p, net_cls_subsys_id),
- struct cgroup_cls_state, css)->classid;
- rcu_read_unlock();
-
- return classid;
-}
+#define clscg_enabled 1
#elif IS_MODULE(CONFIG_NET_CLS_CGROUP)
extern struct static_key cgroup_cls_enabled;
#define clscg_enabled static_key_false(&cgroup_cls_enabled)
+#endif
+
static inline u32 task_cls_classid(struct task_struct *p)
{
u32 classid;
@@ -64,8 +53,6 @@ static inline u32 task_cls_classid(struct task_struct *p)
return classid;
}
-#endif
-
#else /* !CONFIG_NET_CLS_CGROUP */
static inline u32 task_cls_classid(struct task_struct *p)