Re: [PATCH] net: remove redundant ifdef CONFIG_CGROUPS

[Neil Horman]

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@xxxxxxxxxx>
> ---
>  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@xxxxxxxxxxxxx>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/