diff options
author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2012-09-12 10:12:02 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2012-09-14 12:57:25 -0400 |
commit | 8fb974c937570be38f944986456467b39a2dc252 (patch) | |
tree | 7da095ab6580e0649544799cf7ad0afb77733013 /net/core/sock.c | |
parent | f3419807716be503c06f399b2bcbc68823be3a78 (diff) |
cgroup: net_cls: Do not define task_cls_classid() when not selected
task_cls_classid() should not be defined in case the configuration is
CONFIG_NET_CLS_CGROUP=n. The reason is that in a following patch the
net_cls_subsys_id will only be defined if CONFIG_NET_CLS_CGROUP!=n.
When net_cls is not built at all a callee should only get an empty
task_cls_classid() without any references to net_cls_subsys_id.
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>
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 'net/core/sock.c')
-rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 8f67ced8d6a8..82cadc62a872 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -1223,6 +1223,7 @@ static void sk_prot_free(struct proto *prot, struct sock *sk) | |||
1223 | } | 1223 | } |
1224 | 1224 | ||
1225 | #ifdef CONFIG_CGROUPS | 1225 | #ifdef CONFIG_CGROUPS |
1226 | #if IS_ENABLED(CONFIG_NET_CLS_CGROUP) | ||
1226 | void sock_update_classid(struct sock *sk) | 1227 | void sock_update_classid(struct sock *sk) |
1227 | { | 1228 | { |
1228 | u32 classid; | 1229 | u32 classid; |
@@ -1234,6 +1235,7 @@ void sock_update_classid(struct sock *sk) | |||
1234 | sk->sk_classid = classid; | 1235 | sk->sk_classid = classid; |
1235 | } | 1236 | } |
1236 | EXPORT_SYMBOL(sock_update_classid); | 1237 | EXPORT_SYMBOL(sock_update_classid); |
1238 | #endif | ||
1237 | 1239 | ||
1238 | void sock_update_netprioidx(struct sock *sk, struct task_struct *task) | 1240 | void sock_update_netprioidx(struct sock *sk, struct task_struct *task) |
1239 | { | 1241 | { |