lkml.org 
[lkml]   [2013]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] net: remove redundant ifdef CONFIG_CGROUPS
On Thu, Mar 21, 2013 at 10:54:51AM +0800, Li Zefan wrote:
> The cgroup code has been surrounded by ifdef CONFIG_NET_CLS_CGROUP
> and CONFIG_NETPRIO_CGROUP.
>
> Signed-off-by: Li Zefan <lizefan@huawei.com>
> ---
> net/core/sock.c | 2 --
> 1 file changed, 2 deletions(-)
>
> 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 @@ 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
> --
> 1.8.0.2
>
>
Acked-by: Neil Horman <nhorman@tuxdriver.com>



\
 
 \ /
  Last update: 2013-03-21 13:01    [W:0.047 / U:0.572 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site