commit 4021db9a0daa42ff72570f7b0375d195e528f73f
author Zefan Li <lizefan@huawei.com> Wed Mar 20 16:54:51 2013 +0000
committer David S. Miller <davem@davemloft.net> Thu Mar 21 11:47:51 2013 -0400
tree d479c8e4b40458898328281ce3bd78a8e8f0ac3c
parent e33099f96d99c391b3325caa9c44258de04aae86

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>

net/core/sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index b261a79..a19e728 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1298,7 +1298,6 @@
 	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 @@
 }
 EXPORT_SYMBOL_GPL(sock_update_netprioidx);
 #endif
-#endif
 
 /**
  *	sk_alloc - All socket objects are allocated here