netprio_cgroup: define sk_cgrp_prioidx only if NETPRIO_CGROUP is enabled

PATCH Applied Li Zefan 3 participants 3 messages Dec 26, 2012

Subsystems (4)

Networking Network drivers cgroup Sockets

lore

Share & tools

lore

Li Zefan

author

2012-12-26 06:48 UTC #0 lore raw

PATCH 1/1 netprio_cgroup: define sk_cgrp_prioidx only if NETPRIO_CGROUP is enabled

sock->sk_cgrp_prioidx won't be used at all if CONFIG_NETPRIO_CGROUP=n.

Signed-off-by Li Zefan <[email protected]>

---
 include/net/sock.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

include/net/sock.h +1 -1

index 93a6745..182ca99 100644
@@ -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;

Signature · 1 line

1.8.0.2

Neil Horman

Acked-by on v1 1/1

2012-12-26 18:03 UTC #1 lore raw

Quoted 3 lines · Li Zefan

sock->sk_cgrp_prioidx won't be used at all if CONFIG_NETPRIO_CGROUP=n.
Signed-off-by Li Zefan <[email protected]>

Acked-by Neil Horman <[email protected]>

Quoted 21 lines

---
 include/net/sock.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

include/net/sock.h +1 -1

index 93a6745..182ca99 100644
@@ -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;

Signature · 1 line

1.8.0.2

David Miller

maintainer Applied

2012-12-26 22:16 UTC #2 lore raw

From: Neil Horman <[email protected]>
Date: Wed, 26 Dec 2012 13:03:39 -0500

Quoted 5 lines · Li Zefan

Quoted 3 lines
sock->sk_cgrp_prioidx won't be used at all if CONFIG_NETPRIO_CGROUP=n.
Signed-off-by Li Zefan <[email protected]>
Acked-by Neil Horman <[email protected]>

Applied, thanks.