diff options
| author | Zefan Li <lizefan@huawei.com> | 2013-03-20 16:54:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-21 11:47:51 -0400 |
| commit | 4021db9a0daa42ff72570f7b0375d195e528f73f (patch) | |
| tree | d479c8e4b40458898328281ce3bd78a8e8f0ac3c /net | |
| parent | e33099f96d99c391b3325caa9c44258de04aae86 (diff) | |
| download | linux-4021db9a0daa42ff72570f7b0375d195e528f73f.tar.gz linux-4021db9a0daa42ff72570f7b0375d195e528f73f.tar.bz2 linux-4021db9a0daa42ff72570f7b0375d195e528f73f.zip | |
net: remove redundant ifdef CONFIG_CGROUPS
The cgroup code has been surrounded by ifdef CONFIG_NET_CLS_CGROUP
and CONFIG_NETPRIO_CGROUP.
Signed-off-by: Li Zefan <lizefan@huawei.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index b261a7977746..a19e728d5fb6 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1298,7 +1298,6 @@ static void sk_prot_free(struct proto *prot, struct sock *sk) module_put(owner); } -#ifdef CONFIG_CGROUPS #if IS_ENABLED(CONFIG_NET_CLS_CGROUP) void sock_update_classid(struct sock *sk, struct task_struct *task) { @@ -1321,7 +1320,6 @@ void sock_update_netprioidx(struct sock *sk, struct task_struct *task) } EXPORT_SYMBOL_GPL(sock_update_netprioidx); #endif -#endif /** * sk_alloc - All socket objects are allocated here |