From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Wagner Subject: [PATCH v1 1/5] cgroup: Use empty task_cls_classid() when !CONFIG_NET_CLS(_MODULE) Date: Fri, 17 Aug 2012 16:58:10 +0200 Message-ID: <1345215494-9181-2-git-send-email-wagi@monom.org> References: <1345215494-9181-1-git-send-email-wagi@monom.org> Cc: Daniel Wagner , "David S. Miller" , Gao feng , Jamal Hadi Salim , John Fastabend , Li Zefan , Neil Horman , Tejun Heo To: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: <1345215494-9181-1-git-send-email-wagi-kQCPcA+X3s7YtjvyW6yDsg@public.gmane.org> Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org From: Daniel Wagner Signed-off-by: Daniel Wagner Cc: "David S. Miller" Cc: Gao feng Cc: Jamal Hadi Salim Cc: John Fastabend Cc: Li Zefan Cc: Neil Horman Cc: Tejun Heo Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org --- include/net/cls_cgroup.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h index a4dc5b0..e2fe2b9 100644 --- a/include/net/cls_cgroup.h +++ b/include/net/cls_cgroup.h @@ -24,7 +24,8 @@ struct cgroup_cls_state u32 classid; }; -#ifdef CONFIG_NET_CLS_CGROUP +#if IS_BUILTIN(CONFIG_NET_CLS_CGROUP) + static inline u32 task_cls_classid(struct task_struct *p) { int classid; @@ -39,7 +40,9 @@ static inline u32 task_cls_classid(struct task_struct *p) return classid; } -#else + +#elif IS_MODULE(CONFIG_NET_CLS_CGROUP) + extern int net_cls_subsys_id; static inline u32 task_cls_classid(struct task_struct *p) @@ -60,11 +63,16 @@ static inline u32 task_cls_classid(struct task_struct *p) return classid; } -#endif + #else + static inline u32 task_cls_classid(struct task_struct *p) { return 0; } -#endif + +#endif /* CONFIG_NET_CLS_CGROUP */ + +#endif /* CONFIG_CGROURPS */ + #endif /* _NET_CLS_CGROUP_H */ -- 1.7.12.rc1.16.g05a20c8