* [PATCH] net: remove redundant ifdef CONFIG_CGROUPS
@ 2013-03-21 2:54 Li Zefan
2013-03-21 11:22 ` Neil Horman
2013-03-21 15:49 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Li Zefan @ 2013-03-21 2:54 UTC (permalink / raw)
To: David Miller; +Cc: Neil Horman, LKML, netdev
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net: remove redundant ifdef CONFIG_CGROUPS
2013-03-21 2:54 [PATCH] net: remove redundant ifdef CONFIG_CGROUPS Li Zefan
@ 2013-03-21 11:22 ` Neil Horman
2013-03-21 15:49 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Neil Horman @ 2013-03-21 11:22 UTC (permalink / raw)
To: Li Zefan; +Cc: David Miller, LKML, netdev
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>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net: remove redundant ifdef CONFIG_CGROUPS
2013-03-21 2:54 [PATCH] net: remove redundant ifdef CONFIG_CGROUPS Li Zefan
2013-03-21 11:22 ` Neil Horman
@ 2013-03-21 15:49 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2013-03-21 15:49 UTC (permalink / raw)
To: lizefan; +Cc: nhorman, linux-kernel, netdev
From: Li Zefan <lizefan@huawei.com>
Date: Thu, 21 Mar 2013 10:54:51 +0800
> The cgroup code has been surrounded by ifdef CONFIG_NET_CLS_CGROUP
> and CONFIG_NETPRIO_CGROUP.
>
> Signed-off-by: Li Zefan <lizefan@huawei.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-21 15:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-21 2:54 [PATCH] net: remove redundant ifdef CONFIG_CGROUPS Li Zefan
2013-03-21 11:22 ` Neil Horman
2013-03-21 15:49 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).