From: Li Zefan <lizefan@huawei.com>
Date: Tue, 25 Dec 2012 20:48:24 +0000 (+0000)
Subject: netprio_cgroup: define sk_cgrp_prioidx only if NETPRIO_CGROUP is enabled
X-Git-Tag: v3.12-rc1~1662^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d0dcfbd8fa2a1e63fabb5f8edac8b8a27860d98;p=kernel%2Fkernel-generic.git

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 <lizefan@huawei.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

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;