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/sock.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/sock.h')
-rw-r--r-- | include/net/sock.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 72132aef53fc..160a68093dbc 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -1486,14 +1486,6 @@ extern void *sock_kmalloc(struct sock *sk, int size, | |||
1486 | extern void sock_kfree_s(struct sock *sk, void *mem, int size); | 1486 | extern void sock_kfree_s(struct sock *sk, void *mem, int size); |
1487 | extern void sk_send_sigurg(struct sock *sk); | 1487 | extern void sk_send_sigurg(struct sock *sk); |
1488 | 1488 | ||
1489 | #ifdef CONFIG_CGROUPS | ||
1490 | extern void sock_update_classid(struct sock *sk); | ||
1491 | #else | ||
1492 | static inline void sock_update_classid(struct sock *sk) | ||
1493 | { | ||
1494 | } | ||
1495 | #endif | ||
1496 | |||
1497 | /* | 1489 | /* |
1498 | * Functions to fill in entries in struct proto_ops when a protocol | 1490 | * Functions to fill in entries in struct proto_ops when a protocol |
1499 | * does not implement a particular function. | 1491 | * does not implement a particular function. |