diff options
| author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2012-09-12 16:12:01 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2012-09-14 09:55:57 -0700 |
| commit | f3419807716be503c06f399b2bcbc68823be3a78 (patch) | |
| tree | 2915c206cfd338883247d0a70b1867b5d57d8bd0 | |
| parent | 83b061fc09489fb1b827f65cdca014c37ed224bb (diff) | |
| download | linux-3.10-f3419807716be503c06f399b2bcbc68823be3a78.tar.gz linux-3.10-f3419807716be503c06f399b2bcbc68823be3a78.tar.bz2 linux-3.10-f3419807716be503c06f399b2bcbc68823be3a78.zip | |
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
| -rw-r--r-- | drivers/net/tun.c | 1 | ||||
| -rw-r--r-- | include/net/cls_cgroup.h | 6 | ||||
| -rw-r--r-- | include/net/sock.h | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 3a16d4fdaa0..9336b829cc8 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -68,6 +68,7 @@ #include <net/netns/generic.h> #include <net/rtnetlink.h> #include <net/sock.h> +#include <net/cls_cgroup.h> #include <asm/uaccess.h> diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h index a4dc5b027bd..e88527a6845 100644 --- a/include/net/cls_cgroup.h +++ b/include/net/cls_cgroup.h @@ -24,6 +24,8 @@ struct cgroup_cls_state u32 classid; }; +extern void sock_update_classid(struct sock *sk); + #ifdef CONFIG_NET_CLS_CGROUP static inline u32 task_cls_classid(struct task_struct *p) { @@ -62,6 +64,10 @@ static inline u32 task_cls_classid(struct task_struct *p) } #endif #else +static inline void sock_update_classid(struct sock *sk) +{ +} + static inline u32 task_cls_classid(struct task_struct *p) { return 0; diff --git a/include/net/sock.h b/include/net/sock.h index 72132aef53f..160a68093db 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1486,14 +1486,6 @@ extern void *sock_kmalloc(struct sock *sk, int size, extern void sock_kfree_s(struct sock *sk, void *mem, int size); extern void sk_send_sigurg(struct sock *sk); -#ifdef CONFIG_CGROUPS -extern void sock_update_classid(struct sock *sk); -#else -static inline void sock_update_classid(struct sock *sk) -{ -} -#endif - /* * Functions to fill in entries in struct proto_ops when a protocol * does not implement a particular function. |