[PATCH] netprio_cgroup: define sk_cgrp_prioidx only if NETPRIO_CGROUP is enabled
Subsystems:
networking [general] , networking [sockets] , the rest
4981d
3 messages,
3 authors,
2012-12-26 · open the first message on its own page
sock->sk_cgrp_prioidx won't be used at all if CONFIG_NETPRIO_CGROUP=n.
Signed-off-by: Li Zefan <redacted>
---
include/net/sock.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/net/sock.h b/include/net/sock.h
index 93a6745..182ca99 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h @@ -367,7 +367,7 @@ struct sock {
unsigned short sk_ack_backlog ;
unsigned short sk_max_ack_backlog ;
__u32 sk_priority ;
- #ifdef CONFIG_CGROUPS + #if IS_ENABLED(CONFIG_NETPRIO_CGROUP) __u32 sk_cgrp_prioidx ;
#endif
struct pid * sk_peer_pid ; --
1.8.0.2
On Wed, Dec 26, 2012 at 02:48:24PM +0800, Li Zefan wrote: sock->sk_cgrp_prioidx won't be used at all if CONFIG_NETPRIO_CGROUP=n.
Signed-off-by: Li Zefan <redacted> Acked-by: Neil Horman <redacted>
quoted hunk ---
include/net/sock.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/net/sock.h b/include/net/sock.h
index 93a6745..182ca99 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h @@ -367,7 +367,7 @@ struct sock {
unsigned short sk_ack_backlog ;
unsigned short sk_max_ack_backlog ;
__u32 sk_priority ;
- #ifdef CONFIG_CGROUPS + #if IS_ENABLED(CONFIG_NETPRIO_CGROUP) __u32 sk_cgrp_prioidx ;
#endif
struct pid * sk_peer_pid ; --
1.8.0.2
From: Neil Horman <redacted>
Date: Wed, 26 Dec 2012 13:03:39 -0500
On Wed, Dec 26, 2012 at 02:48:24PM +0800, Li Zefan wrote: quoted sock->sk_cgrp_prioidx won't be used at all if CONFIG_NETPRIO_CGROUP=n.
Signed-off-by: Li Zefan <redacted> Acked-by: Neil Horman <redacted>
Applied, thanks.