Skip to contentSkip to conversation

net: remove redundant ifdef CONFIG_CGROUPS

PATCH Applied Li Zefan 3 participants 3 messages Mar 21, 2013

Subsystems (3)
Networking Network drivers Sockets
lore
Share & tools
lore

Li Zefan

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 net/core/sock.c | 2 --
 1 file changed, 2 deletions(-)
net/core/sock.c +0 -2
index b261a79..a19e728 100644
@@ -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
Signature · 1 line
1.8.0.2
Acked-by on v1 1/1
#1 lore raw
Quoted 32 lines · Li Zefan

The cgroup code has been surrounded by ifdef CONFIG_NET_CLS_CGROUP and CONFIG_NETPRIO_CGROUP.

Signed-off-by Li Zefan <[email protected]>
---
 net/core/sock.c | 2 --
 1 file changed, 2 deletions(-)
net/core/sock.c +0 -2
index b261a79..a19e728 100644
@@ -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
Signature · 1 line
1.8.0.2
Acked-by Neil Horman <[email protected]>