From 8c2152286aabe753519d7627a2992625b97e4b20 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Wed, 23 Nov 2011 15:52:58 -0500 Subject: [PATCH] netprio_cgroup: Fix build break I broke the build with the addition of netprio_cgroups if CONFIG_CGROUPS=n. This patch corrects it by moving the offending struct into an ifdef CONFIG_CGROUPS block. Also clean up a few needless defines and inline functions that don't get called if CONFIG_CGROUPS isn't defined while Im at it. Signed-off-by: Neil Horman Signed-off-by: David S. Miller --- include/net/netprio_cgroup.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h index c432e99942af..e503b87c4c1b 100644 --- a/include/net/netprio_cgroup.h +++ b/include/net/netprio_cgroup.h @@ -18,11 +18,6 @@ #include #include -struct cgroup_netprio_state -{ - struct cgroup_subsys_state css; - u32 prioidx; -}; struct netprio_map { struct rcu_head rcu; @@ -32,6 +27,11 @@ struct netprio_map { #ifdef CONFIG_CGROUPS +struct cgroup_netprio_state { + struct cgroup_subsys_state css; + u32 prioidx; +}; + #ifndef CONFIG_NETPRIO_CGROUP extern int net_prio_subsys_id; #endif @@ -52,14 +52,6 @@ static inline struct cgroup_netprio_state #else #define sock_update_netprioidx(sk) -#define skb_update_prio(skb) - -static inline struct cgroup_netprio_state - *task_netprio_state(struct task_struct *p) -{ - return NULL; -} - #endif #endif /* _NET_CLS_CGROUP_H */ -- 2.20.1