diff options
author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2012-09-12 10:12:01 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2012-09-14 12:55:57 -0400 |
commit | f3419807716be503c06f399b2bcbc68823be3a78 (patch) | |
tree | 2915c206cfd338883247d0a70b1867b5d57d8bd0 /include/net/cls_cgroup.h | |
parent | 83b061fc09489fb1b827f65cdca014c37ed224bb (diff) |
cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h
The only user of sock_update_classid() is net/socket.c which happens
to include cls_cgroup.h directly.
tj: Fix build breakage due to missing cls_cgroup.h inclusion in
drivers/net/tun.c reported in linux-next by Stephen.
Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Gao feng <gaofeng@cn.fujitsu.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: John Fastabend <john.r.fastabend@intel.com>
Cc: netdev@vger.kernel.org
Cc: cgroups@vger.kernel.org
Diffstat (limited to 'include/net/cls_cgroup.h')
-rw-r--r-- | include/net/cls_cgroup.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h index a4dc5b027bd9..e88527a68454 100644 --- a/include/net/cls_cgroup.h +++ b/include/net/cls_cgroup.h | |||
@@ -24,6 +24,8 @@ struct cgroup_cls_state | |||
24 | u32 classid; | 24 | u32 classid; |
25 | }; | 25 | }; |
26 | 26 | ||
27 | extern void sock_update_classid(struct sock *sk); | ||
28 | |||
27 | #ifdef CONFIG_NET_CLS_CGROUP | 29 | #ifdef CONFIG_NET_CLS_CGROUP |
28 | static inline u32 task_cls_classid(struct task_struct *p) | 30 | static inline u32 task_cls_classid(struct task_struct *p) |
29 | { | 31 | { |
@@ -62,6 +64,10 @@ static inline u32 task_cls_classid(struct task_struct *p) | |||
62 | } | 64 | } |
63 | #endif | 65 | #endif |
64 | #else | 66 | #else |
67 | static inline void sock_update_classid(struct sock *sk) | ||
68 | { | ||
69 | } | ||
70 | |||
65 | static inline u32 task_cls_classid(struct task_struct *p) | 71 | static inline u32 task_cls_classid(struct task_struct *p) |
66 | { | 72 | { |
67 | return 0; | 73 | return 0; |